Change-Id: Ibe42b5a8eb0488b013374f191599a1bab008ba95

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

262 files changed, 27864 insertions, 13937 deletions

diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDiagramElement_localStyle_Style.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDiagramElement_localStyle_Style.gif
new file mode 100644
index 00000000000..9ee8d4c209d
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDiagramElement_localStyle_Style.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDiagramElement_ownedElement_Diagram.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDiagramElement_ownedElement_Diagram.gif
new file mode 100644
index 00000000000..57826ccb40b
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDiagramElement_ownedElement_Diagram.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDiagramElement_ownedElement_Edge.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDiagramElement_ownedElement_Edge.gif
new file mode 100644
index 00000000000..180d9c7786e
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDiagramElement_ownedElement_Edge.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDiagramElement_ownedElement_Shape.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDiagramElement_ownedElement_Shape.gif
new file mode 100644
index 00000000000..6b2a5688daf
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/icons/full/ctool16/CreateDiagramElement_ownedElement_Shape.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties
index 386355b1980..8adaa8c5620 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.properties
@@ -259,3 +259,16 @@ _UI_ElementKind_rectangle_literal = rectangle
 _UI_ElementKind_text_literal = text
 _UI_ElementKind_use_literal = use
 _UI_RootCanvas_externalStyleSheet_feature = External Style Sheet
+_UI_DiagramElement_targetEdge_feature = Target Edge
+_UI_DiagramElement_sourceEdge_feature = Source Edge
+_UI_DiagramElement_owningDiagramElement_feature = Owning Diagram Element
+_UI_DiagramElement_ownedDiagramElement_feature = Owned Diagram Element
+_UI_Edge_sourceDiagramElement_feature = Source Diagram Element
+_UI_Edge_targetDiagramElement_feature = Target Diagram Element
+_UI_Group_layout_feature = Layout
+_UI_GraphicalElement_layoutData_feature = Layout Data
+_UI_RootCanvas_script_feature = Script
+_UI_Text_anchor_feature = Anchor
+_UI_TextAnchor_start_literal = start
+_UI_TextAnchor_middle_literal = middle
+_UI_TextAnchor_end_literal = end
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.xml b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.xml
index 4916d3d1f81..872a03911ef 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.xml
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/plugin.xml
@@ -53,7 +53,9 @@
                org.eclipse.emf.edit.provider.IStructuredItemContentProvider
                org.eclipse.emf.edit.provider.ITreeItemContentProvider
                org.eclipse.emf.edit.provider.IItemLabelProvider
-               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+               org.eclipse.emf.edit.provider.IItemPropertySource
+               org.eclipse.emf.edit.provider.IItemColorProvider
+               org.eclipse.emf.edit.provider.IItemFontProvider"/>
    </extension>
 
 </plugin>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java
index 78e42101755..a53434a2d85 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java
@@ -16,9 +16,7 @@ import java.util.List;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EStructuralFeature;
-
 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
@@ -30,7 +28,6 @@ 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.dd.dg.DGFactory;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.GraphicalElement;
@@ -69,6 +66,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
 
 			addClipPathPropertyDescriptor(object);
 			addClassPropertyDescriptor(object);
+			addLayoutDataPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -118,6 +116,28 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
 	}
 
 	/**
+	 * This adds a property descriptor for the Layout Data feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLayoutDataPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_GraphicalElement_layoutData_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_layoutData_feature", "_UI_GraphicalElement_type"),
+				 DGPackage.Literals.GRAPHICAL_ELEMENT__LAYOUT_DATA,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
@@ -151,17 +171,45 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((GraphicalElement)object).getId();
+		String label = getLabel((GraphicalElement)object);
 		return label == null || label.length() == 0 ?
 			getString("_UI_GraphicalElement_type") :
 			getString("_UI_GraphicalElement_type") + " " + label;
 	}
 
 	/**
+	 * Get the label of the given graphical element
+	 * 
+	 * @param element The graphical element
+	 * @return String label of the graphical element
+	 */
+	protected String getLabel(GraphicalElement element) {
+		String label = "";
+		
+		if (element.getId() != null)
+			label += "id="+element.getId();
+			
+		if (!element.getClasses().isEmpty()) {
+			if (label.length()>0)
+				label += ", ";
+			label += joinString("class", element.getClasses(), ",");
+		}
+		
+		return (label.length()>0) ? "["+label+"]" : "";
+	}
+	
+	private String joinString(String key, Collection<String> values, String sep) {
+		String s = "";
+		for (String v : values)
+			s += (s.length()>0) ? ", "+v : v;
+		return key+"="+s;
+	}
+	
+	/**
 	 * 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 --> <!--
@@ -174,6 +222,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
 
 		switch (notification.getFeatureID(GraphicalElement.class)) {
 			case DGPackage.GRAPHICAL_ELEMENT__CLASS:
+			case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case DGPackage.GRAPHICAL_ELEMENT__STYLE:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
index 8e0da315e94..4b0e3253205 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.common.notify.Notification;
 
 import org.eclipse.emf.ecore.EStructuralFeature;
 
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
 import org.eclipse.emf.edit.provider.IItemColorProvider;
 import org.eclipse.emf.edit.provider.IItemFontProvider;
@@ -27,6 +28,7 @@ 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.dd.dg.DGFactory;
@@ -64,11 +66,34 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
+			addLayoutPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
+	 * This adds a property descriptor for the Layout feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addLayoutPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Group_layout_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Group_layout_feature", "_UI_Group_type"),
+				 DGPackage.Literals.GROUP__LAYOUT,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
@@ -111,11 +136,11 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * @generated
+	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
-		String label = ((Group)object).getId();
+		String label = getLabel((Group)object);
 		return label == null || label.length() == 0 ?
 			getString("_UI_Group_type") :
 			getString("_UI_Group_type") + " " + label;
@@ -133,6 +158,9 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
 		updateChildren(notification);
 
 		switch (notification.getFeatureID(Group.class)) {
+			case DGPackage.GROUP__LAYOUT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+				return;
 			case DGPackage.GROUP__MEMBER:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 				return;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
index 08588dd1354..6315811b4b7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
@@ -68,6 +68,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
 
 			addBackgroundColorPropertyDescriptor(object);
 			addExternalStyleSheetPropertyDescriptor(object);
+			addScriptPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -116,6 +117,28 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
 	}
 
 	/**
+	 * This adds a property descriptor for the Script feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addScriptPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_RootCanvas_script_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_script_feature", "_UI_RootCanvas_type"),
+				 DGPackage.Literals.ROOT_CANVAS__SCRIPT,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
@@ -182,6 +205,7 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
 
 		switch (notification.getFeatureID(RootCanvas.class)) {
 			case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
+			case DGPackage.ROOT_CANVAS__SCRIPT:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case DGPackage.ROOT_CANVAS__DEFINITIONS:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java
index 99c7b0ecc9a..54beedce73a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java
@@ -68,6 +68,7 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
 			super.getPropertyDescriptors(object);
 
 			addDataPropertyDescriptor(object);
+			addAnchorPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
@@ -95,6 +96,28 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
 	}
 
 	/**
+	 * This adds a property descriptor for the Anchor feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addAnchorPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Text_anchor_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Text_anchor_feature", "_UI_Text_type"),
+				 DGPackage.Literals.TEXT__ANCHOR,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
@@ -160,6 +183,7 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
 
 		switch (notification.getFeatureID(Text.class)) {
 			case DGPackage.TEXT__DATA:
+			case DGPackage.TEXT__ANCHOR:
 				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 				return;
 			case DGPackage.TEXT__POSITION:
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java
index f3bad6a5d4a..d7635c394a5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java
@@ -24,6 +24,8 @@ import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.IChangeNotifier;
 import org.eclipse.emf.edit.provider.IDisposable;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
@@ -80,6 +82,8 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
 		supportedTypes.add(ITreeItemContentProvider.class);
 		supportedTypes.add(IItemLabelProvider.class);
 		supportedTypes.add(IItemPropertySource.class);
+		supportedTypes.add(IItemColorProvider.class);
+		supportedTypes.add(IItemFontProvider.class);
 	}
 
 	/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java
index b0e45887bd8..5f9279ae5ca 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java
@@ -13,27 +13,18 @@ package org.eclipse.papyrus.dd.di.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.common.util.ResourceLocator;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
 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.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-
-import org.eclipse.papyrus.dd.di.DIPackage;
-import org.eclipse.papyrus.dd.di.DiagramElement;
-
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -43,8 +34,7 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * @generated
  */
 public class DiagramElementItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
@@ -67,132 +57,11 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addModelElementPropertyDescriptor(object);
-			addOwningElementPropertyDescriptor(object);
-			addOwnedElementPropertyDescriptor(object);
-			addSharedStylePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This adds a property descriptor for the Model Element feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addModelElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DiagramElement_modelElement_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_modelElement_feature", "_UI_DiagramElement_type"),
-				 DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT,
-				 false,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Owning Element feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addOwningElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DiagramElement_owningElement_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_owningElement_feature", "_UI_DiagramElement_type"),
-				 DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_ELEMENT,
-				 false,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Owned Element feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addOwnedElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DiagramElement_ownedElement_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_ownedElement_feature", "_UI_DiagramElement_type"),
-				 DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_ELEMENT,
-				 false,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Shared Style feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addSharedStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DiagramElement_sharedStyle_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_sharedStyle_feature", "_UI_DiagramElement_type"),
-				 DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
@@ -213,12 +82,6 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(DiagramElement.class)) {
-			case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
 		super.notifyChanged(notification);
 	}
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java
index c01f70b3f0b..79270f1dcc2 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java
@@ -19,6 +19,8 @@ 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.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
@@ -37,8 +39,7 @@ import org.eclipse.papyrus.dd.di.Diagram;
  * @generated
  */
 public class DiagramItemProvider extends ShapeItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java
index 28ffe59d6f0..fdb2b782ebc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java
@@ -13,23 +13,19 @@ package org.eclipse.papyrus.dd.di.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.ecore.EStructuralFeature;
-
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
 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.ViewerNotification;
-
 import org.eclipse.papyrus.dd.dc.DCFactory;
-
 import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.Edge;
 
@@ -40,8 +36,7 @@ import org.eclipse.papyrus.dd.di.Edge;
  * @generated
  */
 public class EdgeItemProvider extends DiagramElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
@@ -64,57 +59,11 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
 		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
-			addSourcePropertyDescriptor(object);
-			addTargetPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
 	}
 
 	/**
-	 * This adds a property descriptor for the Source feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addSourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Edge_source_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Edge_source_feature", "_UI_Edge_type"),
-				 DIPackage.Literals.EDGE__SOURCE,
-				 false,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Target feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addTargetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Edge_target_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Edge_target_feature", "_UI_Edge_type"),
-				 DIPackage.Literals.EDGE__TARGET,
-				 false,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
 	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java
index ca1ee4f456c..9f02b47c37b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java
@@ -20,6 +20,8 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EStructuralFeature;
 
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
@@ -39,8 +41,7 @@ import org.eclipse.papyrus.dd.di.Shape;
  * @generated
  */
 public class ShapeItemProvider extends DiagramElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java
index 72b98c6d3d4..3c0430abc35 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java
@@ -20,6 +20,8 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.util.ResourceLocator;
 
 import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
@@ -36,8 +38,7 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * @generated
  */
 public class StyleItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java
index ca8f65e4b9c..33bc648df61 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.common.util.ResourceLocator;
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
 
 /**
- * This is the central singleton for the DI edit plugin.
+ * This is the central singleton for the DG edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF
index 5482e71f048..e89f541aa21 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/META-INF/MANIFEST.MF
@@ -40,13 +40,14 @@ Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: org.eclipse.papyrus.dd.dg.editor,
  org.eclipse.papyrus.dd.editor
-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime;visibility:=reexport,
  org.eclipse.core.resources;visibility:=reexport,
  org.eclipse.papyrus.dd.edit;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
  org.eclipse.emf.edit.ui;visibility:=reexport,
  org.eclipse.ui.ide;visibility:=reexport,
  org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.ui.forms;bundle-version="3.6.1",
- org.eclipse.jface.text;bundle-version="3.8.101"
+ org.eclipse.ui.forms;bundle-version="3.6.1";visibility:=reexport,
+ org.eclipse.jface.text;bundle-version="3.8.101";visibility:=reexport,
+ org.eclipse.help;bundle-version="3.6.0";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/icons/full/obj16/DIModelFile.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/icons/full/obj16/DIModelFile.gif
new file mode 100644
index 00000000000..8a7eeb2c824
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/icons/full/obj16/DIModelFile.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/icons/full/wizban/NewDI.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/icons/full/wizban/NewDI.gif
new file mode 100644
index 00000000000..eab53a99e8c
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/icons/full/wizban/NewDI.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/icons/help.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/icons/help.gif
new file mode 100644
index 00000000000..ae2c4c0abdb
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/icons/help.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/plugin.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/plugin.properties
index 3f03e5508a1..e3ac0a672e4 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/plugin.properties
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/plugin.properties
@@ -11,12 +11,8 @@
 pluginName = DD Editor
 providerName = CEA LIST
 
-_UI_DGEditor_menu = &DG Editor
-
 DDModelPage.title=Model
 DDSourcePage.title=Source
-DGSVGSourcePage.title=SVG
-DGSVGCanvasPage.title=Canvas
 
 _UI_CreateChild_menu_item = &New Child
 _UI_CreateSibling_menu_item = N&ew Sibling
@@ -43,14 +39,6 @@ _UI_Wizard_category = Example EMF Model Creation Wizards
 
 _UI_CreateModelError_message = Problems encountered in file "{0}"
 
-_UI_DGModelWizard_label = DG Model
-_UI_DGModelWizard_description = Create a new DG model
-
-_UI_DGEditor_label = DG Model Editor
-
-_UI_DGEditorFilenameDefaultBase = My
-_UI_DGEditorFilenameExtensions = dg
-
 _UI_Wizard_label = New
 
 _WARN_FilenameExtension = The file name must end in ''.{0}''
@@ -64,3 +52,26 @@ _UI_Wizard_initial_object_description = Select a model object to create
 _UI_FileConflict_label = File Conflict
 _WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
 
+#------------------------------------------------------------------------
+
+DGSVGSourcePage.title=SVG
+DGSVGCanvasPage.title=Canvas
+
+_UI_DGEditor_menu = &DG Editor
+_UI_DGModelWizard_label = DG Model
+_UI_DGModelWizard_description = Create a new DG model
+_UI_DGEditor_label = DG Model Editor
+_UI_DGEditorFilenameDefaultBase = My
+_UI_DGEditorFilenameExtensions = dg
+
+#------------------------------------------------------------------------
+
+DGSVGSourcePage.title=SVG
+DGSVGCanvasPage.title=Canvas
+
+_UI_DIEditor_menu = &DI Editor
+_UI_DIModelWizard_label = DI Model
+_UI_DIModelWizard_description = Create a new DI model
+_UI_DIEditor_label = DI Model Editor
+_UI_DIEditorFilenameDefaultBase = My
+_UI_DIEditorFilenameExtensions = di
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/plugin.xml b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/plugin.xml
index 0cab4104ca6..0185ae80f68 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/plugin.xml
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/plugin.xml
@@ -21,7 +21,7 @@
             id="org.eclipse.emf.ecore.Wizard.category.ID"
             name="%_UI_Wizard_category"/>
       <wizard
-            id="org.eclipse.papyrus.dd.dg.presentation.DGModelWizardID"
+            id="org.eclipse.papyrus.dd.dg.editor.DGModelWizard"
             name="%_UI_DGModelWizard_label"
             class="org.eclipse.papyrus.dd.dg.editor.DGModelWizard"
             category="org.eclipse.emf.ecore.Wizard.category.ID"
@@ -34,7 +34,7 @@
    <extension point="org.eclipse.ui.editors">
       <!-- @generated DG -->
       <editor
-            id="org.eclipse.papyrus.dd.dg.presentation.DGEditorID"
+            id="org.eclipse.papyrus.dd.dg.editor.DGEditor"
             name="%_UI_DGEditor_label"
             icon="icons/full/obj16/DGModelFile.gif"
             extensions="dg"
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java
index e5801cb11d8..be3f5cc4245 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java
@@ -12,11 +12,14 @@
 package org.eclipse.papyrus.dd.dg.editor;
 
 import java.awt.Color;
+import java.io.IOException;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.svggen.SVGSyntax;
+import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.emf.common.util.TreeIterator;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EObject;
@@ -68,10 +71,12 @@ import org.eclipse.papyrus.dd.dg.StyleRule;
 import org.eclipse.papyrus.dd.dg.StyleSelector;
 import org.eclipse.papyrus.dd.dg.StyleSheet;
 import org.eclipse.papyrus.dd.dg.Text;
+import org.eclipse.papyrus.dd.dg.TextAnchor;
 import org.eclipse.papyrus.dd.dg.Transform;
 import org.eclipse.papyrus.dd.dg.Translate;
 import org.eclipse.papyrus.dd.dg.Use;
 import org.eclipse.papyrus.dd.dg.util.DGSwitch;
+import org.eclipse.papyrus.dd.editor.DDEditorPlugin;
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -108,6 +113,16 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 	public static final String SVG_MARKER_END_ATTRIBUTE = "marker-end";
 
 	/**
+	 * This is the layout property
+	 */
+	public static final String SVG_LAYOUT_ATTRIBUTE = "layout";
+
+	/**
+	 * This is the layout data property
+	 */
+	public static final String SVG_LAYOUT_DATA_ATTRIBUTE = "layoutData";
+
+	/**
 	 * This is the DG model resource
 	 */
 	private Resource resource;
@@ -149,7 +164,6 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 				SVG_SVG_TAG, null);
 
 		// establish a base URL for the SVG document to resolve relative links
-		// URL url = DDEditorPlugin.getPlugin().getBundle().getEntry("/svg");
 		svgDocument.setDocumentURI(resource.getURI().toString());
 
 		// iterate over all contents and convert them
@@ -293,7 +307,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 				svg.setAttribute(SVG_HEIGHT_ATTRIBUTE,
 						convertDoubleToString(bounds.getHeight()));
 		}
-
+		
 		return super.caseCanvas(object);
 	}
 
@@ -519,6 +533,9 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 				}
 				element.setAttribute(SVG_TRANSFORM_ATTRIBUTE, transforms);
 			}
+			
+			if (object.getLayoutData() != null)
+				element.setAttribute(SVG_LAYOUT_DATA_ATTRIBUTE, object.getLayoutData());
 		}
 
 		return super.caseGraphicalElement(object);
@@ -533,6 +550,9 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 					svgDocument.createElementNS(SVG_NAMESPACE_URI, SVG_G_TAG));
 			getParentElement(object).appendChild(g);
 		}
+		
+		if (object.getLayout() != null)
+			g.setAttribute(SVG_LAYOUT_ATTRIBUTE, object.getLayout());
 
 		return super.caseGroup(object);
 	}
@@ -954,6 +974,13 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 		Element svg = map(object, svgDocument.getDocumentElement());
 		svg.setAttribute(XMLNS_PREFIX, SVG_NAMESPACE_URI);
 		svg.setAttribute(XMLNS_PREFIX + ":" + XLINK_PREFIX, XLINK_NAMESPACE_URI);
+		svg.setAttribute(SVG_ONLOAD_ATTRIBUTE, "validate(evt.target)");
+		
+		if (object.eIsSet(DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR)) {
+			String background = convertColorToString(object
+					.getBackgroundColor());
+			svg.setAttribute(SVG_BACKGROUND_COLOR_ATTRIBUTE, background);
+		}
 
 		for (StyleSheet styleSheet : object.getExternalStyleSheets()) {
 			String target = "xml-stylesheet";
@@ -963,13 +990,18 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 					target, data);
 			svgDocument.insertBefore(pi, svgDocument.getDocumentElement());
 		}
-
-		if (object.eIsSet(DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR)) {
-			String background = convertColorToString(object
-					.getBackgroundColor());
-			svg.setAttribute(SVG_BACKGROUND_COLOR_ATTRIBUTE, background);
+		
+		for (String s : object.getScripts()) {
+			try {
+				URL url = FileLocator.toFileURL(new URL(s));
+				Element script = svgDocument.createElementNS(SVG_NAMESPACE_URI, SVG_SCRIPT_TAG);
+				script.setAttributeNS(XLINK_NAMESPACE_URI, XLINK_HREF_QNAME, url.toString());
+				svg.appendChild(script);
+			} catch (IOException e) {
+				DDEditorPlugin.getPlugin().log(e);
+			}
 		}
-
+		
 		if (object.getDefinitions() != null) {
 			doSwitch(object.getDefinitions());
 		}
@@ -1206,8 +1238,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 			sb.append("\n\t\t\t" + (String) doSwitch(rule));
 		}
 		styleSheet.setAttribute(SVG_TYPE_ATTRIBUTE, "text/css");
-		styleSheet.appendChild(svgDocument.createCDATASection(sb.toString()
-				+ "\n\t\t"));
+		styleSheet.appendChild(svgDocument.createCDATASection(sb.toString()));
 
 		return super.caseStyleSheet(object);
 	}
@@ -1231,6 +1262,18 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 				text.setAttribute(SVG_Y_ATTRIBUTE,
 						convertDoubleToString(position.getY()));
 		}
+		
+		if (object.getAnchor() != null) {
+			TextAnchor ta = object.getAnchor();
+			String value = null;
+			if (ta.equals(TextAnchor.START))
+				value = "start";
+			else if (ta.equals(TextAnchor.MIDDLE))
+				value = "middle";
+			else if (ta.equals(TextAnchor.END))
+				value = "end";
+			text.setAttribute(SVG_TEXT_ANCHOR_ATTRIBUTE, value);
+		}
 
 		return super.caseText(object);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java
index fe44de48294..4b35d846ce0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java
@@ -11,10 +11,14 @@
  */
 package org.eclipse.papyrus.dd.editor;
 
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.forms.IManagedForm;
 import org.eclipse.ui.forms.editor.FormPage;
 import org.eclipse.ui.forms.widgets.FormToolkit;
@@ -72,7 +76,9 @@ public abstract class DDEditorPage extends FormPage {
 		form.setText(getTitle());
 		Composite body = form.getBody();
 		body.setLayout(new FillLayout());
-		viewer = createViewer(body);
+		this.viewer = createViewer(body);
+		setupActions(form.getToolBarManager());
+		form.updateToolBar();
 	}
 
 	/**
@@ -119,4 +125,34 @@ public abstract class DDEditorPage extends FormPage {
 		// no default implementation
 	}
 
+	/**
+	 * Adds actions to the page's toolbar
+	 * 
+	 * @param manager The page's toolbar manager
+	 */
+	public void setupActions(IToolBarManager manager) {
+		manager.add(new Separator("Page"));
+		manager.add(new Separator("Common"));
+
+		Action action;
+		
+		action = new Action("Help") {
+			public void run() {
+				PlatformUI.getWorkbench().getHelpSystem().displayHelp(getPageHelpId());
+			}
+		};
+		action.setToolTipText("Show help");
+		action.setImageDescriptor(DDEditorPlugin.getImageDescriptor(DDEditorPlugin.IMAGE_HELP));
+		manager.appendToGroup("Common", action);
+	}
+	
+	/**
+	 * Get the help id associated with this page
+	 * 
+	 * @return String the id of the help page
+	 */
+	protected String getPageHelpId() {
+		return "";
+	}
+	
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java
index b40e7e09867..a2d3eda0860 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java
@@ -12,13 +12,11 @@
 package org.eclipse.papyrus.dd.editor;
 
 import org.eclipse.emf.common.EMFPlugin;
-
 import org.eclipse.emf.common.ui.EclipseUIPlugin;
-
 import org.eclipse.emf.common.util.ResourceLocator;
-
 import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
 import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 
 /**
@@ -26,6 +24,8 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  */
 public final class DDEditorPlugin extends EMFPlugin {
 
+	public static final String IMAGE_HELP = "Help";
+	
 	/**
 	 * Keep track of the singleton.
 	 */
@@ -77,6 +77,17 @@ public final class DDEditorPlugin extends EMFPlugin {
 			// Remember the static instance.
 			plugin = this;
 		}
+
+		@Override
+		protected void initializeImageRegistry(ImageRegistry reg) {
+			super.initializeImageRegistry(reg);
+			reg.put(IMAGE_HELP, ImageDescriptor.createFromURL(getBundle().getEntry("icons/help.gif")));
+		}
+		
+	}
+
+	public static ImageDescriptor getImageDescriptor(String id) {
+		return getPlugin().getImageRegistry().getDescriptor(id);
 	}
 
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/svg/scripts/layouts.js b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/svg/scripts/layouts.js
deleted file mode 100644
index 320fde089e8..00000000000
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/svg/scripts/layouts.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Copyright (c) 2014 CEA LIST.
- *  
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *  
- * Contributors:
- *  CEA LIST - Initial API and implementation
- */
-
-function layout(evt) {
-	doLayout(evt.target);
-}
-
-function doLayout(parent) {
-	verticalFlow(parent);
-}
-
-function verticalFlow(parent) {
-	var x = parent.getAttribute("x");
-	var y = parent.getAttribute("y");
-	var width = parent.getAttribute("width");
-	var height = parent.getAttribute("height");
-
-	var children = parent.getChildNodes();
-	var n = children.getLength();
-	var childHeight = height / n; 
-    for (var i=0; i<n; i++)
-		setBounds(children.item(i), 0, i*childHeight, width, childHeight);
-}
-
-function setBounds(element, x, y, width, height) {
-	if (element.tagName == "rect")
-		setRectBounds(element, x, y, width, height);
-	else if (element.tagName == "svg")
-		setSvgBounds(element, x, y, width, height);
-	else if (element.tagName == "circle")
-		setCircleBounds(element, x, y, width, height);
-	else if (element.tagName == "text")
-		setTextBounds(element, x, y, width, height);
-}
-
-function setSvgBounds(element, x, y, width, height) {
-	element.setAttribute("x", x);
-	element.setAttribute("y", y);
-	element.setAttribute("width", width);
-	element.setAttribute("height", height);
-	doLayout(element);
-}
-
-function setRectBounds(element, x, y, width, height) {
-	element.setAttribute("x", x);
-	element.setAttribute("y", y);
-	element.setAttribute("width", width);
-	element.setAttribute("height", height);
-}
-
-function setCircleBounds(element, x, y, width, height) {
-	element.setAttribute("cx", x+width/2);
-	element.setAttribute("cy", y+height/2);
-	if (width <= height)
-		element.setAttribute("r", width/2);
-	else
-		element.setAttribute("r", height/2);
-}
-
-function setTextBounds(element, x, y, width, height) {
-	var bbox = element.getBBox();
-	element.setAttribute("x", x+(width-bbox.width)/2);
-	element.setAttribute("y", y+(height+bbox.height/2)/2);
-}
-
-function setLineBounds(element, x, y, width, height) {
-	var bbox = element.getBBox();
-	element.setAttribute("x1", x);
-	element.setAttribute("y1", y);
-	element.setAttribute("x2", x+width);
-	element.setAttribute("y2", y+height);
-}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.cmof b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.cmof
deleted file mode 100644
index 1d3674c0875..00000000000
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.cmof
+++ /dev/null
@@ -1,382 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:cmof="http://schema.omg.org/spec/MOF/2.0/cmof.xml" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA http://schema.omg.org/spec/MOF/2.0/cmof.xml http://www.eclipse.org/uml2/4.0.0/UML">

-  <cmof:Package xmi:id="_0" name="DC" uri="http://www.omg.org/spec/DD/20110901/DC">

-    <ownedComment xmi:type="cmof:Comment" xmi:id="_ownedComment.0" annotatedElement="_0">

-      <body>The Diagram Common (DC) package contains abstractions shared by the Diagram Interchange and the Diagram Graphics packages.</body>

-    </ownedComment>

-    <ownedMember xmi:type="cmof:PrimitiveType" xmi:id="Boolean" name="Boolean">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Boolean-_ownedComment.0" annotatedElement="Boolean">

-        <body>Boolean is a primitive data type having one of two values: &lt;i>true&lt;/i> or &lt;i>false&lt;/i>, intended to represent the truth value of logical expressions.</body>

-      </ownedComment>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:PrimitiveType" xmi:id="Integer" name="Integer">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Integer-_ownedComment.0" annotatedElement="Integer">

-        <body>Integer is a primitive data type used to represent the mathematical concept of integer.</body>

-      </ownedComment>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:PrimitiveType" xmi:id="Real" name="Real">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Real-_ownedComment.0" annotatedElement="Real">

-        <body>Real is a primitive data type used to represent the mathematical concept of real.</body>

-      </ownedComment>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:PrimitiveType" xmi:id="String" name="String">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="String-_ownedComment.0" annotatedElement="String">

-        <body>String is a primitive data type used to represent a sequence of characters in some suitable character set.</body>

-      </ownedComment>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:PrimitiveType" xmi:id="Color" name="Color">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Color-_ownedComment.0" annotatedElement="Color">

-        <body>Color is a primitive type that represents a color value. Literals are in the #rrggbb format.</body>

-      </ownedComment>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Enumeration" xmi:id="KnownColor" name="KnownColor">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-_ownedComment.0" annotatedElement="KnownColor">

-        <body>KnownColor is an enumeration of 17 known colors.</body>

-      </ownedComment>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-maroon" name="maroon" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-maroon-_ownedComment.0" annotatedElement="KnownColor-maroon">

-          <body>a color with a value of #800000</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-red" name="red" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-red-_ownedComment.0" annotatedElement="KnownColor-red">

-          <body>a color with a value of #FF0000</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-orange" name="orange" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-orange-_ownedComment.0" annotatedElement="KnownColor-orange">

-          <body>a color with a value of #FFA500</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-yellow" name="yellow" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-yellow-_ownedComment.0" annotatedElement="KnownColor-yellow">

-          <body>a color with a value of #FFFF00</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-olive" name="olive" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-olive-_ownedComment.0" annotatedElement="KnownColor-olive">

-          <body>a color with a value of #808000</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-purple" name="purple" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-purple-_ownedComment.0" annotatedElement="KnownColor-purple">

-          <body>a color with a value of #800080</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-fuchsia" name="fuchsia" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-fuchsia-_ownedComment.0" annotatedElement="KnownColor-fuchsia">

-          <body>a color with a value of #FF00FF</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-white" name="white" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-white-_ownedComment.0" annotatedElement="KnownColor-white">

-          <body>a color with a value of #FFFFFF</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-lime" name="lime" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-lime-_ownedComment.0" annotatedElement="KnownColor-lime">

-          <body>a color with a value of #00FF00</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-green" name="green" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-green-_ownedComment.0" annotatedElement="KnownColor-green">

-          <body>a color with a value of #008000</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-navy" name="navy" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-navy-_ownedComment.0" annotatedElement="KnownColor-navy">

-          <body>a color with a value of #000080</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-blue" name="blue" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-blue-_ownedComment.0" annotatedElement="KnownColor-blue">

-          <body>a color with a value of #0000FF</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-aqua" name="aqua" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-aqua-_ownedComment.0" annotatedElement="KnownColor-aqua">

-          <body>a color with a value of #00FFFF</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-teal" name="teal" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-teal-_ownedComment.0" annotatedElement="KnownColor-teal">

-          <body>a color with a value of #008080</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-black" name="black" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-black-_ownedComment.0" annotatedElement="KnownColor-black">

-          <body>a color with a value of #000000</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-silver" name="silver" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-silver-_ownedComment.0" annotatedElement="KnownColor-silver">

-          <body>a color with a value of #C0C0C0</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="KnownColor-gray" name="gray" classifier="#KnownColor" enumeration="KnownColor">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="KnownColor-gray-_ownedComment.0" annotatedElement="KnownColor-gray">

-          <body>a color with a value of #808080</body>

-        </ownedComment>

-      </ownedLiteral>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:DataType" xmi:id="Point" name="Point">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Point-_ownedComment.0" annotatedElement="Point">

-        <body>A Point specifies an location in some x-y coordinate system.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Point-x" name="x" visibility="public" type="Real" lower="0" datatype="Point" default="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Point-x-_ownedComment.0" annotatedElement="Point-x">

-          <body>a real number (&lt;= 0 or >= 0) that represents the x-coordinate of the point.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Point-y" name="y" visibility="public" type="Real" lower="0" datatype="Point" default="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Point-y-_ownedComment.0" annotatedElement="Point-y">

-          <body>a real number (&lt;= 0 or >= 0)  that represents the y-coordinate of the point.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:DataType" xmi:id="Dimension" name="Dimension">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Dimension-_ownedComment.0" annotatedElement="Dimension">

-        <body>Dimension specifies two lengths (width and height) along the x and y axes in some x-y coordinate system.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="Dimension-non_negative_dimension" name="non_negative_width" constrainedElement="Bounds" namespace="Dimension">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Dimension-non_negative_dimension-_ownedComment.0" annotatedElement="Dimension-non_negative_dimension">

-          <body>the width of a dimension cannot be negative</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="Dimension-non_negative_dimension-_specification">

-          <language>OCL</language>

-          <body>width >=0</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_uRqWUOhyEeO6TvQHODg78w" name="non_negative_height" constrainedElement="Bounds" namespace="Dimension">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_uRqWUehyEeO6TvQHODg78w" annotatedElement="_uRqWUOhyEeO6TvQHODg78w">

-          <body>the height of a dimension cannot be negative</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_uRqWUuhyEeO6TvQHODg78w">

-          <language>OCL</language>

-          <body>height >=0</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Dimension-width" name="width" visibility="public" type="Real" lower="0" datatype="Dimension" default="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Dimension-width-_ownedComment.0" annotatedElement="Dimension-width">

-          <body>a real number (>=0) that represents a length along the x-axis.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Dimension-height" name="height" visibility="public" type="Real" lower="0" datatype="Dimension" default="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Dimension-height-_ownedComment.0" annotatedElement="Dimension-height">

-          <body>a real number (>=0) that represents a length along the y-axis.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:DataType" xmi:id="Bounds" name="Bounds">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Bounds-_ownedComment.0" annotatedElement="Bounds">

-        <body>Bounds specifies a rectangular area in some x-y coordinate system that is defined by a location (x and y) and a size (width and height).</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="Bounds-non_negative_size" name="non_negative_width" constrainedElement="Bounds" namespace="Bounds">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Bounds-non_negative_size-_ownedComment.0" annotatedElement="Bounds-non_negative_size">

-          <body>the width of bounds cannot be negative</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="Bounds-non_negative_size-_specification">

-          <language>OCL</language>

-          <body>width >= 0</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_fdKnQOhyEeO6TvQHODg78w" name="non_negative_height" constrainedElement="Bounds" namespace="Bounds">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_fdKnQehyEeO6TvQHODg78w" annotatedElement="_fdKnQOhyEeO6TvQHODg78w">

-          <body>the height of bounds cannot be negative</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_fdKnQuhyEeO6TvQHODg78w">

-          <language>OCL</language>

-          <body>height >=0</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Bounds-x" name="x" visibility="public" type="Real" lower="0" datatype="Bounds" default="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Bounds-x-_ownedComment.0" annotatedElement="Bounds-x">

-          <body>a real number (>=0 or &lt;=0) that represents the x-coordinate of the bounds</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Bounds-y" name="y" visibility="public" type="Real" lower="0" datatype="Bounds" default="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Bounds-y-_ownedComment.0" annotatedElement="Bounds-y">

-          <body>a real number (>=0 or &lt;=0) that represents the y-coordinate of the bounds</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Bounds-width" name="width" visibility="public" type="Real" lower="0" datatype="Bounds" default="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Bounds-width-_ownedComment.0" annotatedElement="Bounds-width">

-          <body>a real number (>=0) that represents the width of the bounds</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Bounds-height" name="height" visibility="public" type="Real" lower="0" datatype="Bounds" default="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Bounds-height-_ownedComment.0" annotatedElement="Bounds-height">

-          <body>a real number (>=0) that represents the height of the bounds</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-      <profileApplication xmi:type="cmof:ProfileApplication" xmi:id="_VIXq4M6NEeOqlr8E3pzO9g" applyingPackage="_0">

-        <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_VIYR8M6NEeOqlr8E3pzO9g" source="http://www.eclipse.org/uml2/2.0.0/UML">

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

-          </eAnnotations>

-        </xmi:Extension>

-        <appliedProfile xmi:type="cmof:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>

-      </profileApplication>

-    </xmi:Extension>

-  </cmof:Package>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_WVZesM6NEeOqlr8E3pzO9g" base_Package="_0" packageName="dc" nsPrefix="dc" nsURI="http://www.omg.org/spec/DD/20110901/DC" basePackage="org.eclipse.papyrus.dd" prefix="DC"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EDataType xmi:id="_lT6scM6NEeOqlr8E3pzO9g" instanceClassName="boolean" base_PrimitiveType="Boolean"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EDataType xmi:id="_nlyBYM6NEeOqlr8E3pzO9g" instanceClassName="int" base_PrimitiveType="Integer"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EDataType xmi:id="_pw_UsM6NEeOqlr8E3pzO9g" instanceClassName="double" base_PrimitiveType="Real"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EDataType xmi:id="_sVOzEM6NEeOqlr8E3pzO9g" instanceClassName="java.lang.String" base_PrimitiveType="String"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EDataType xmi:id="_uoG0oM6NEeOqlr8E3pzO9g" instanceClassName="java.awt.Color" base_PrimitiveType="Color"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_GLPu0M6OEeOqlr8E3pzO9g" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_sSCDMM6PEeOqlr8E3pzO9g" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_M74_YM6SEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-maroon" literal="#800000"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_1YIksM6SEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-red" literal="#FF0000"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_8A7doM6SEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-orange" literal="#FFA500"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_-0ejUM6SEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-yellow" literal="#FFFF00"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_BTeVUM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-olive" literal="#808000"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_E0ng0M6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-purple" literal="#800080"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_HuiUQM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-fuchsia" literal="#FF00FF"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_LPD0sM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-white" literal="#FFFFFF"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_NZd2wM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-lime" literal="#00FF00"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_P6XGMM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-green" literal="#008000"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_SYEewM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-navy" literal="#000080"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_UtzAAM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-blue" literal="#0000FF"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_WxqVMM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-aqua" literal="#00FFFF"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_ZwEAAM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-teal" literal="#008080"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_cVGIkM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-black" literal="#000000"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_f9QiEM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-silver" literal="#C0C0C0"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EEnumLiteral xmi:id="_ieKYkM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-gray" literal="#808080"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_uE2xEM6iEeOqlr8E3pzO9g" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_phRUUM6mEeOqlr8E3pzO9g" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_AcahIM75EeOqlr8E3pzO9g" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="__Xn68M8GEeOg6q3i7VavPA" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_0IKjcM8HEeOg6q3i7VavPA" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_6AtOsM8IEeOg6q3i7VavPA" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_I5Q2INTiEeO3TMM_EGdzeA" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_3EuuQNc2EeOgmPOh7kSfHA" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_e6X_cNesEeOsUY1jE2-lpg" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_gItq8NpWEeOltvy1wTDHDA" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_ptXHoOHCEeO71tdCkM4EDw" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_3Y3MsOIiEeO71tdCkM4EDw" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_qBWzoOgCEeOCQP_PQv7dlg" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_wr5HEOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Point-x"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_ykau8OgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Point-y"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_08dkYOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Dimension-width"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_3Ga6gOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Dimension-height"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_5Iff8OgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Bounds-x"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_72q9cOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Bounds-y"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_-skzkOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Bounds-width"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_AiAEIOgFEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Bounds-height"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_Yo9QgOgaEeO6TvQHODg78w" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_4tITcOghEeO6TvQHODg78w" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_ZLSagOhnEeO6TvQHODg78w" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_9syAgOhyEeO6TvQHODg78w" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_MSBV8O0xEeOCPtJ2AfZp5A" base_Package="_0" nsPrefix="dc"/>

-  </xmi:Extension>

-  <cmof:Tag xmi:id="_52" name="org.omg.xmi.nsPrefix" value="dc" element="_0"/>

-  <cmof:Tag xmi:id="_53" name="org.omg.xmi.nsURI" value="http://www.omg.org/spec/DD/20110901/DC" element="_0"/>

-  <cmof:Tag xmi:id="_54" name="org.omg.xmi.schemaType" value="http://www.w3.org/2001/XMLSchema#boolean" element="Boolean"/>

-  <cmof:Tag xmi:id="_55" name="org.omg.xmi.schemaType" value="http://www.w3.org/2001/XMLSchema#integer" element="Integer"/>

-  <cmof:Tag xmi:id="_56" name="org.omg.xmi.schemaType" value="http://www.w3.org/2001/XMLSchema#double" element="Real"/>

-</xmi:XMI>

diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.di b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.di
new file mode 100644
index 00000000000..1f548399e07
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList>
+    <availablePage>
+      <emfPageIdentifier href="DC.notation#_KTj3kPpKEeOw_Nx9vOEGaA"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="DC.notation#_KTj3kPpKEeOw_Nx9vOEGaA"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.genmodel b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.genmodel
index 32a09b06e08..14df4ebbf74 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.genmodel
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.genmodel
@@ -26,7 +26,7 @@
     <details key="CAMEL_CASE_NAMES" value="PROCESS"/>
     <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
   </genAnnotations>
-  <foreignModel>DC.cmof</foreignModel>
+  <foreignModel>DC.uml</foreignModel>
   <genPackages xsi:type="genmodel:GenPackage" prefix="DC" basePackage="org.eclipse.papyrus.dd"
       disposableProviderFactory="true" ecorePackage="DC.ecore#/">
     <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="DC.ecore#//KnownColor">
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.notation b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.notation
new file mode 100644
index 00000000000..76641d6a379
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.notation
@@ -0,0 +1,394 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA" xmi:id="_KTj3kPpKEeOw_Nx9vOEGaA" type="PapyrusUMLClassDiagram" name="DC Package" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_MAvyIPpKEeOw_Nx9vOEGaA" type="2009" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MA3G4PpKEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MA3G4fpKEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MA3t8PpKEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MA3t8fpKEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MA3t8vpKEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MA3t8_pKEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_MA6KMPpKEeOw_Nx9vOEGaA" type="5032"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_MA8mcPpKEeOw_Nx9vOEGaA" visible="false" type="7039">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MA8mcfpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_MA8mcvpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_MA8mc_pKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MA8mdPpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_MA8mdfpKEeOw_Nx9vOEGaA" visible="false" type="7040">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MA8mdvpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_MA8md_pKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_MA8mePpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MA8mefpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_MDsYcPpKEeOw_Nx9vOEGaA" visible="false" type="AppliedStereotypeCompartement">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MDsYcfpKEeOw_Nx9vOEGaA" showTitle="true"/>
+      <element xmi:type="Ecore:EDataType" href="DC.uml#_lT6scM6NEeOqlr8E3pzO9g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MDsYcvpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_MDvbwPpKEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_MDvbwfpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MDvbwvpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MAvyIfpKEeOw_Nx9vOEGaA" x="20" y="20"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_NOySkPpKEeOw_Nx9vOEGaA" type="2009" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NOy5oPpKEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NOy5ofpKEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NOy5ovpKEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NOy5o_pKEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NOy5pPpKEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NOy5pfpKEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_NOy5pvpKEeOw_Nx9vOEGaA" type="5032"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NOy5p_pKEeOw_Nx9vOEGaA" visible="false" type="7039">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NOy5qPpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_NOy5qfpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_NOy5qvpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NOy5q_pKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NOy5rPpKEeOw_Nx9vOEGaA" visible="false" type="7040">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NOy5rfpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_NOy5rvpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_NOy5r_pKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NOy5sPpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NO5AQPpKEeOw_Nx9vOEGaA" visible="false" type="AppliedStereotypeCompartement">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NO5AQfpKEeOw_Nx9vOEGaA" showTitle="true"/>
+      <element xmi:type="Ecore:EDataType" href="DC.uml#_nlyBYM6NEeOqlr8E3pzO9g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NO5AQvpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NO5nUPpKEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NO5nUfpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NO5nUvpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:PrimitiveType" href="DC.uml#Integer"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NOySkfpKEeOw_Nx9vOEGaA" x="140" y="20"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_NO8qoPpKEeOw_Nx9vOEGaA" type="2009" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NO9RsPpKEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NO9RsfpKEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NO9RsvpKEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NO9Rs_pKEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NO9RtPpKEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NO9RtfpKEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_NO9RtvpKEeOw_Nx9vOEGaA" type="5032"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NO9Rt_pKEeOw_Nx9vOEGaA" visible="false" type="7039">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NO9RuPpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_NO9RufpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_NO9RuvpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NO9Ru_pKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NO9RvPpKEeOw_Nx9vOEGaA" visible="false" type="7040">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NO9RvfpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_NO9RvvpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_NO9Rv_pKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NO9RwPpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NPCxQPpKEeOw_Nx9vOEGaA" visible="false" type="AppliedStereotypeCompartement">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NPCxQfpKEeOw_Nx9vOEGaA" showTitle="true"/>
+      <element xmi:type="Ecore:EDataType" href="DC.uml#_pw_UsM6NEeOqlr8E3pzO9g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NPCxQvpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NPCxQ_pKEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NPCxRPpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NPCxRfpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NO8qofpKEeOw_Nx9vOEGaA" x="260" y="20"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_NPF0kPpKEeOw_Nx9vOEGaA" type="2009" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NPGboPpKEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NPGbofpKEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NPGbovpKEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NPGbo_pKEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NPGbpPpKEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NPGbpfpKEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_NPGbpvpKEeOw_Nx9vOEGaA" type="5032"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NPGbp_pKEeOw_Nx9vOEGaA" visible="false" type="7039">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NPGbqPpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_NPGbqfpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_NPGbqvpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NPGbq_pKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NPGbrPpKEeOw_Nx9vOEGaA" visible="false" type="7040">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NPGbrfpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_NPGbrvpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_NPGbr_pKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NPGbsPpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NPL7MPpKEeOw_Nx9vOEGaA" visible="false" type="AppliedStereotypeCompartement">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NPL7MfpKEeOw_Nx9vOEGaA" showTitle="true"/>
+      <element xmi:type="Ecore:EDataType" href="DC.uml#_sVOzEM6NEeOqlr8E3pzO9g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NPL7MvpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NPL7M_pKEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NPL7NPpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NPL7NfpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NPF0kfpKEeOw_Nx9vOEGaA" x="380" y="20"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_NPO-gPpKEeOw_Nx9vOEGaA" type="2009" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NPPlkPpKEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NPPlkfpKEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NPPlkvpKEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NPPlk_pKEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_NPPllPpKEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_NPPllfpKEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_NPPllvpKEeOw_Nx9vOEGaA" type="5032"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NPPll_pKEeOw_Nx9vOEGaA" visible="false" type="7039">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NPPlmPpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_NPPlmfpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_NPPlmvpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NPPlm_pKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NPPlnPpKEeOw_Nx9vOEGaA" visible="false" type="7040">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NPPlnfpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_NPPlnvpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_NPPln_pKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NPPloPpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NPWTQPpKEeOw_Nx9vOEGaA" visible="false" type="AppliedStereotypeCompartement">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NPWTQfpKEeOw_Nx9vOEGaA" showTitle="true"/>
+      <element xmi:type="Ecore:EDataType" href="DC.uml#_uoG0oM6NEeOqlr8E3pzO9g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NPWTQvpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_NPWTQ_pKEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_NPWTRPpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NPWTRfpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:PrimitiveType" href="DC.uml#Color"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NPO-gfpKEeOw_Nx9vOEGaA" x="500" y="20"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_ddze4PpKEeOw_Nx9vOEGaA" type="2006" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ddze4vpKEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ddze4_pKEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dd0F8PpKEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dd0F8fpKEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dd0F8vpKEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dd0F8_pKEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_dd0F9PpKEeOw_Nx9vOEGaA" type="5023"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_dd0F9fpKEeOw_Nx9vOEGaA" type="7015">
+      <children xmi:type="notation:Shape" xmi:id="_iV9goPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-maroon"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iV9gofpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWFccPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-red"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWFccfpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWH4sPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-orange"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWH4sfpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWJt4PpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-yellow"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWJt4fpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWLjEPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-olive"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWLjEfpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWN_UPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-purple"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWN_UfpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWRCoPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-fuchsia"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWRCofpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWS30PpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-white"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWS30fpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWUtAPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-lime"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWUtAfpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWWiMPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-green"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWWiMfpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWYXYPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-navy"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWYXYfpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWaMkPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-blue"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWaMkfpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWco0PpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-aqua"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWco0fpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWeeAPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-teal"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWeeAfpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWgTMPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-black"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWgTMfpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWivcPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-silver"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWivcfpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_iWkkoPpKEeOw_Nx9vOEGaA" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:EnumerationLiteral" href="DC.uml#KnownColor-gray"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_iWkkofpKEeOw_Nx9vOEGaA" x="32" y="41"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_dd0F9vpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_dd0F9_pKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_dd0F-PpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dd0F-fpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_deGZ0PpKEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_deGZ0fpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_deGZ0vpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:Enumeration" href="DC.uml#KnownColor"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ddze4fpKEeOw_Nx9vOEGaA" x="620" y="20"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_5f_-UPpKEeOw_Nx9vOEGaA" type="2010" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5f_-UvpKEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5gAlYPpKEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5gAlYfpKEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5gAlYvpKEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5gAlY_pKEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5gAlZPpKEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_5gAlZfpKEeOw_Nx9vOEGaA" type="5035"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_5gAlZvpKEeOw_Nx9vOEGaA" type="7020">
+      <children xmi:type="notation:Shape" xmi:id="_8mWEMPpKEeOw_Nx9vOEGaA" type="3018" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DC.uml#Point-x"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8mWEMfpKEeOw_Nx9vOEGaA" x="28" y="23"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_8mkGoPpKEeOw_Nx9vOEGaA" type="3018" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DC.uml#Point-y"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8mkGofpKEeOw_Nx9vOEGaA" x="28" y="23"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_5gAlZ_pKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_5gAlaPpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_5gAlafpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5gAlavpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_5gAla_pKEeOw_Nx9vOEGaA" visible="false" type="7021">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_5gAlbPpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_5gAlbfpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_5gAlbvpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5gAlb_pKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_5gUHYPpKEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_5gUHYfpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5gUHYvpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:DataType" href="DC.uml#Point"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5f_-UfpKEeOw_Nx9vOEGaA" x="20" y="100" height="81"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_5gYY0PpKEeOw_Nx9vOEGaA" type="2010" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5gY_4PpKEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5gY_4fpKEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5gY_4vpKEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5gY_4_pKEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5gY_5PpKEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5gY_5fpKEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_5gY_5vpKEeOw_Nx9vOEGaA" type="5035"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_5gY_5_pKEeOw_Nx9vOEGaA" type="7020">
+      <children xmi:type="notation:Shape" xmi:id="__wed4PpKEeOw_Nx9vOEGaA" type="3018" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DC.uml#Dimension-width"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__wed4fpKEeOw_Nx9vOEGaA" x="53" y="8"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="__whhMPpKEeOw_Nx9vOEGaA" type="3018" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DC.uml#Dimension-height"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__whhMfpKEeOw_Nx9vOEGaA" x="53" y="8"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_5gY_6PpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_5gY_6fpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_5gY_6vpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5gY_6_pKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_5gZm8PpKEeOw_Nx9vOEGaA" visible="false" type="7021">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_5gZm8fpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_5gZm8vpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_5gZm8_pKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5gZm9PpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_5gefcPpKEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_5gefcfpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5gefcvpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:DataType" href="DC.uml#Dimension"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5gYY0fpKEeOw_Nx9vOEGaA" x="140" y="100" height="81"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_5ghiwPpKEeOw_Nx9vOEGaA" type="2010" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5ghiwvpKEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5ghiw_pKEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5ghixPpKEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5giJ0PpKEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5giJ0fpKEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5giJ0vpKEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_5giJ0_pKEeOw_Nx9vOEGaA" type="5035"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_5giJ1PpKEeOw_Nx9vOEGaA" type="7020">
+      <children xmi:type="notation:Shape" xmi:id="_C3J68PpLEeOw_Nx9vOEGaA" type="3018" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DC.uml#Bounds-x"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_C3J68fpLEeOw_Nx9vOEGaA" x="49" y="16"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_C3M-QPpLEeOw_Nx9vOEGaA" type="3018" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DC.uml#Bounds-y"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_C3M-QfpLEeOw_Nx9vOEGaA" x="49" y="16"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_C3OzcPpLEeOw_Nx9vOEGaA" type="3018" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DC.uml#Bounds-width"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_C3OzcfpLEeOw_Nx9vOEGaA" x="49" y="16"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_C3RPsPpLEeOw_Nx9vOEGaA" type="3018" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DC.uml#Bounds-height"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_C3RPsfpLEeOw_Nx9vOEGaA" x="49" y="16"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_5giJ1fpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_5giJ1vpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_5giJ1_pKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5giJ2PpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_5giJ2fpKEeOw_Nx9vOEGaA" visible="false" type="7021">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_5giJ2vpKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_5giJ2_pKEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_5giJ3PpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5giJ3fpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_5gnCUPpKEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_5gnCUfpKEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5gnCUvpKEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:DataType" href="DC.uml#Bounds"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5ghiwfpKEeOw_Nx9vOEGaA" x="280" y="100" height="101"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_KTj3kfpKEeOw_Nx9vOEGaA"/>
+  <element xmi:type="uml:Package" href="DC.uml#_0"/>
+</notation:Diagram>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.uml b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.uml
new file mode 100644
index 00000000000..d0ef7f15b9b
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DC.uml
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+  <uml:Package xmi:id="_0" name="DC" URI="http://www.omg.org/spec/DD/20110901/DC">
+    <ownedComment xmi:id="_ownedComment.0" annotatedElement="_0">
+      <body>The Diagram Common (DC) package contains abstractions shared by the Diagram Interchange and the Diagram Graphics packages.</body>
+    </ownedComment>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="Boolean" name="Boolean">
+      <ownedComment xmi:id="Boolean-_ownedComment.0" annotatedElement="Boolean">
+        <body>Boolean is a primitive data type having one of two values: &lt;i>true&lt;/i> or &lt;i>false&lt;/i>, intended to represent the truth value of logical expressions.</body>
+      </ownedComment>
+    </packagedElement>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="Integer" name="Integer">
+      <ownedComment xmi:id="Integer-_ownedComment.0" annotatedElement="Integer">
+        <body>Integer is a primitive data type used to represent the mathematical concept of integer.</body>
+      </ownedComment>
+    </packagedElement>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="Real" name="Real">
+      <ownedComment xmi:id="Real-_ownedComment.0" annotatedElement="Real">
+        <body>Real is a primitive data type used to represent the mathematical concept of real.</body>
+      </ownedComment>
+    </packagedElement>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="String" name="String">
+      <ownedComment xmi:id="String-_ownedComment.0" annotatedElement="String">
+        <body>String is a primitive data type used to represent a sequence of characters in some suitable character set.</body>
+      </ownedComment>
+    </packagedElement>
+    <packagedElement xmi:type="uml:PrimitiveType" xmi:id="Color" name="Color">
+      <ownedComment xmi:id="Color-_ownedComment.0" annotatedElement="Color">
+        <body>Color is a primitive type that represents a color value. Literals are in the #rrggbb format.</body>
+      </ownedComment>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="KnownColor" name="KnownColor">
+      <ownedComment xmi:id="KnownColor-_ownedComment.0" annotatedElement="KnownColor">
+        <body>KnownColor is an enumeration of 17 known colors.</body>
+      </ownedComment>
+      <ownedLiteral xmi:id="KnownColor-maroon" name="maroon">
+        <ownedComment xmi:id="KnownColor-maroon-_ownedComment.0" annotatedElement="KnownColor-maroon">
+          <body>a color with a value of #800000</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-red" name="red">
+        <ownedComment xmi:id="KnownColor-red-_ownedComment.0" annotatedElement="KnownColor-red">
+          <body>a color with a value of #FF0000</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-orange" name="orange">
+        <ownedComment xmi:id="KnownColor-orange-_ownedComment.0" annotatedElement="KnownColor-orange">
+          <body>a color with a value of #FFA500</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-yellow" name="yellow">
+        <ownedComment xmi:id="KnownColor-yellow-_ownedComment.0" annotatedElement="KnownColor-yellow">
+          <body>a color with a value of #FFFF00</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-olive" name="olive">
+        <ownedComment xmi:id="KnownColor-olive-_ownedComment.0" annotatedElement="KnownColor-olive">
+          <body>a color with a value of #808000</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-purple" name="purple">
+        <ownedComment xmi:id="KnownColor-purple-_ownedComment.0" annotatedElement="KnownColor-purple">
+          <body>a color with a value of #800080</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-fuchsia" name="fuchsia">
+        <ownedComment xmi:id="KnownColor-fuchsia-_ownedComment.0" annotatedElement="KnownColor-fuchsia">
+          <body>a color with a value of #FF00FF</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-white" name="white">
+        <ownedComment xmi:id="KnownColor-white-_ownedComment.0" annotatedElement="KnownColor-white">
+          <body>a color with a value of #FFFFFF</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-lime" name="lime">
+        <ownedComment xmi:id="KnownColor-lime-_ownedComment.0" annotatedElement="KnownColor-lime">
+          <body>a color with a value of #00FF00</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-green" name="green">
+        <ownedComment xmi:id="KnownColor-green-_ownedComment.0" annotatedElement="KnownColor-green">
+          <body>a color with a value of #008000</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-navy" name="navy">
+        <ownedComment xmi:id="KnownColor-navy-_ownedComment.0" annotatedElement="KnownColor-navy">
+          <body>a color with a value of #000080</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-blue" name="blue">
+        <ownedComment xmi:id="KnownColor-blue-_ownedComment.0" annotatedElement="KnownColor-blue">
+          <body>a color with a value of #0000FF</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-aqua" name="aqua">
+        <ownedComment xmi:id="KnownColor-aqua-_ownedComment.0" annotatedElement="KnownColor-aqua">
+          <body>a color with a value of #00FFFF</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-teal" name="teal">
+        <ownedComment xmi:id="KnownColor-teal-_ownedComment.0" annotatedElement="KnownColor-teal">
+          <body>a color with a value of #008080</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-black" name="black">
+        <ownedComment xmi:id="KnownColor-black-_ownedComment.0" annotatedElement="KnownColor-black">
+          <body>a color with a value of #000000</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-silver" name="silver">
+        <ownedComment xmi:id="KnownColor-silver-_ownedComment.0" annotatedElement="KnownColor-silver">
+          <body>a color with a value of #C0C0C0</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="KnownColor-gray" name="gray">
+        <ownedComment xmi:id="KnownColor-gray-_ownedComment.0" annotatedElement="KnownColor-gray">
+          <body>a color with a value of #808080</body>
+        </ownedComment>
+      </ownedLiteral>
+    </packagedElement>
+    <packagedElement xmi:type="uml:DataType" xmi:id="Point" name="Point">
+      <ownedComment xmi:id="Point-_ownedComment.0" annotatedElement="Point">
+        <body>A Point specifies an location in some x-y coordinate system.</body>
+      </ownedComment>
+      <ownedAttribute xmi:id="Point-x" name="x" visibility="public" type="Real">
+        <ownedComment xmi:id="Point-x-_ownedComment.0" annotatedElement="Point-x">
+          <body>a real number (&lt;= 0 or >= 0) that represents the x-coordinate of the point.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LVOkMPovEeOw_Nx9vOEGaA"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_LVOkMfovEeOw_Nx9vOEGaA" value="0"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Point-y" name="y" visibility="public" type="Real">
+        <ownedComment xmi:id="Point-y-_ownedComment.0" annotatedElement="Point-y">
+          <body>a real number (&lt;= 0 or >= 0)  that represents the y-coordinate of the point.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LVOkMvovEeOw_Nx9vOEGaA"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_LVOkM_ovEeOw_Nx9vOEGaA" value="0"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:DataType" xmi:id="Dimension" name="Dimension">
+      <ownedComment xmi:id="Dimension-_ownedComment.0" annotatedElement="Dimension">
+        <body>Dimension specifies two lengths (width and height) along the x and y axes in some x-y coordinate system.</body>
+      </ownedComment>
+      <ownedRule xmi:id="Dimension-non_negative_dimension" name="non_negative_width" constrainedElement="Bounds">
+        <ownedComment xmi:id="Dimension-non_negative_dimension-_ownedComment.0" annotatedElement="Dimension-non_negative_dimension">
+          <body>the width of a dimension cannot be negative</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="Dimension-non_negative_dimension-_specification">
+          <language>OCL</language>
+          <body>width >=0</body>
+        </specification>
+      </ownedRule>
+      <ownedRule xmi:id="_uRqWUOhyEeO6TvQHODg78w" name="non_negative_height" constrainedElement="Bounds">
+        <ownedComment xmi:id="_uRqWUehyEeO6TvQHODg78w" annotatedElement="_uRqWUOhyEeO6TvQHODg78w">
+          <body>the height of a dimension cannot be negative</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_uRqWUuhyEeO6TvQHODg78w">
+          <language>OCL</language>
+          <body>height >=0</body>
+        </specification>
+      </ownedRule>
+      <ownedAttribute xmi:id="Dimension-width" name="width" visibility="public" type="Real">
+        <ownedComment xmi:id="Dimension-width-_ownedComment.0" annotatedElement="Dimension-width">
+          <body>a real number (>=0) that represents a length along the x-axis.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LVOkNPovEeOw_Nx9vOEGaA"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_LVOkNfovEeOw_Nx9vOEGaA" value="0"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Dimension-height" name="height" visibility="public" type="Real">
+        <ownedComment xmi:id="Dimension-height-_ownedComment.0" annotatedElement="Dimension-height">
+          <body>a real number (>=0) that represents a length along the y-axis.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LVOkNvovEeOw_Nx9vOEGaA"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_LVOkN_ovEeOw_Nx9vOEGaA" value="0"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:DataType" xmi:id="Bounds" name="Bounds">
+      <ownedComment xmi:id="Bounds-_ownedComment.0" annotatedElement="Bounds">
+        <body>Bounds specifies a rectangular area in some x-y coordinate system that is defined by a location (x and y) and a size (width and height).</body>
+      </ownedComment>
+      <ownedRule xmi:id="Bounds-non_negative_size" name="non_negative_width" constrainedElement="Bounds">
+        <ownedComment xmi:id="Bounds-non_negative_size-_ownedComment.0" annotatedElement="Bounds-non_negative_size">
+          <body>the width of bounds cannot be negative</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="Bounds-non_negative_size-_specification">
+          <language>OCL</language>
+          <body>width >= 0</body>
+        </specification>
+      </ownedRule>
+      <ownedRule xmi:id="_fdKnQOhyEeO6TvQHODg78w" name="non_negative_height" constrainedElement="Bounds">
+        <ownedComment xmi:id="_fdKnQehyEeO6TvQHODg78w" annotatedElement="_fdKnQOhyEeO6TvQHODg78w">
+          <body>the height of bounds cannot be negative</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_fdKnQuhyEeO6TvQHODg78w">
+          <language>OCL</language>
+          <body>height >=0</body>
+        </specification>
+      </ownedRule>
+      <ownedAttribute xmi:id="Bounds-x" name="x" visibility="public" type="Real">
+        <ownedComment xmi:id="Bounds-x-_ownedComment.0" annotatedElement="Bounds-x">
+          <body>a real number (>=0 or &lt;=0) that represents the x-coordinate of the bounds</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LVPLQPovEeOw_Nx9vOEGaA"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_LVPLQfovEeOw_Nx9vOEGaA" value="0"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Bounds-y" name="y" visibility="public" type="Real">
+        <ownedComment xmi:id="Bounds-y-_ownedComment.0" annotatedElement="Bounds-y">
+          <body>a real number (>=0 or &lt;=0) that represents the y-coordinate of the bounds</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LVPLQvovEeOw_Nx9vOEGaA"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_LVPLQ_ovEeOw_Nx9vOEGaA" value="0"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Bounds-width" name="width" visibility="public" type="Real">
+        <ownedComment xmi:id="Bounds-width-_ownedComment.0" annotatedElement="Bounds-width">
+          <body>a real number (>=0) that represents the width of the bounds</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LVPLRPovEeOw_Nx9vOEGaA"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_LVPLRfovEeOw_Nx9vOEGaA" value="0"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Bounds-height" name="height" visibility="public" type="Real">
+        <ownedComment xmi:id="Bounds-height-_ownedComment.0" annotatedElement="Bounds-height">
+          <body>a real number (>=0) that represents the height of the bounds</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_LVPLRvovEeOw_Nx9vOEGaA"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_LVPLR_ovEeOw_Nx9vOEGaA" value="0"/>
+      </ownedAttribute>
+    </packagedElement>
+    <profileApplication xmi:id="_WijYQPovEeOw_Nx9vOEGaA">
+      <eAnnotations xmi:id="_WilNcPovEeOw_Nx9vOEGaA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
+      </eAnnotations>
+      <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+    </profileApplication>
+  </uml:Package>
+  <Ecore:EPackage xmi:id="_dc8XgPovEeOw_Nx9vOEGaA" base_Package="_0" packageName="dc" nsPrefix="dc" basePackage="org.eclipse.papyrus.dd" prefix="DC"/>
+  <Ecore:EDataType xmi:id="_lT6scM6NEeOqlr8E3pzO9g" instanceClassName="boolean" base_PrimitiveType="Boolean"/>
+  <Ecore:EDataType xmi:id="_nlyBYM6NEeOqlr8E3pzO9g" instanceClassName="int" base_PrimitiveType="Integer"/>
+  <Ecore:EDataType xmi:id="_pw_UsM6NEeOqlr8E3pzO9g" instanceClassName="double" base_PrimitiveType="Real"/>
+  <Ecore:EDataType xmi:id="_sVOzEM6NEeOqlr8E3pzO9g" instanceClassName="java.lang.String" base_PrimitiveType="String"/>
+  <Ecore:EDataType xmi:id="_uoG0oM6NEeOqlr8E3pzO9g" instanceClassName="java.awt.Color" base_PrimitiveType="Color"/>
+  <Ecore:EEnumLiteral xmi:id="_M74_YM6SEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-maroon" literal="#800000"/>
+  <Ecore:EEnumLiteral xmi:id="_1YIksM6SEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-red" literal="#FF0000"/>
+  <Ecore:EEnumLiteral xmi:id="_8A7doM6SEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-orange" literal="#FFA500"/>
+  <Ecore:EEnumLiteral xmi:id="_-0ejUM6SEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-yellow" literal="#FFFF00"/>
+  <Ecore:EEnumLiteral xmi:id="_BTeVUM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-olive" literal="#808000"/>
+  <Ecore:EEnumLiteral xmi:id="_E0ng0M6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-purple" literal="#800080"/>
+  <Ecore:EEnumLiteral xmi:id="_HuiUQM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-fuchsia" literal="#FF00FF"/>
+  <Ecore:EEnumLiteral xmi:id="_LPD0sM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-white" literal="#FFFFFF"/>
+  <Ecore:EEnumLiteral xmi:id="_NZd2wM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-lime" literal="#00FF00"/>
+  <Ecore:EEnumLiteral xmi:id="_P6XGMM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-green" literal="#008000"/>
+  <Ecore:EEnumLiteral xmi:id="_SYEewM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-navy" literal="#000080"/>
+  <Ecore:EEnumLiteral xmi:id="_UtzAAM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-blue" literal="#0000FF"/>
+  <Ecore:EEnumLiteral xmi:id="_WxqVMM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-aqua" literal="#00FFFF"/>
+  <Ecore:EEnumLiteral xmi:id="_ZwEAAM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-teal" literal="#008080"/>
+  <Ecore:EEnumLiteral xmi:id="_cVGIkM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-black" literal="#000000"/>
+  <Ecore:EEnumLiteral xmi:id="_f9QiEM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-silver" literal="#C0C0C0"/>
+  <Ecore:EEnumLiteral xmi:id="_ieKYkM6TEeOqlr8E3pzO9g" base_EnumerationLiteral="KnownColor-gray" literal="#808080"/>
+  <Ecore:EAttribute xmi:id="_wr5HEOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Point-x"/>
+  <Ecore:EAttribute xmi:id="_ykau8OgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Point-y"/>
+  <Ecore:EAttribute xmi:id="_08dkYOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Dimension-width"/>
+  <Ecore:EAttribute xmi:id="_3Ga6gOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Dimension-height"/>
+  <Ecore:EAttribute xmi:id="_5Iff8OgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Bounds-x"/>
+  <Ecore:EAttribute xmi:id="_72q9cOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Bounds-y"/>
+  <Ecore:EAttribute xmi:id="_-skzkOgEEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Bounds-width"/>
+  <Ecore:EAttribute xmi:id="_AiAEIOgFEeOCQP_PQv7dlg" isUnsettable="true" base_Property="Bounds-height"/>
+</xmi:XMI>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.cmof b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.cmof
deleted file mode 100644
index 98434347879..00000000000
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.cmof
+++ /dev/null
@@ -1,1185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:cmof="http://schema.omg.org/spec/MOF/2.0/cmof.xml" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA http://schema.omg.org/spec/MOF/2.0/cmof.xml http://www.eclipse.org/uml2/4.0.0/UML">

-  <cmof:Package xmi:id="_0" name="DG" uri="http://www.omg.org/spec/DD/20110901/DG">

-    <ownedComment xmi:type="cmof:Comment" xmi:id="_ownedComment.0" annotatedElement="_0">

-      <body>The Diagram Graphics (DG) package contains a model of graphical primitives that can be instantiated when mapping from a language abstract syntax models and diagram interchange (DI) models to visual presentations. The mapping effectively defines the concrete syntax of a language. This specification does not restrict how the mappings are done, or what languages are used to define them.</body>

-    </ownedComment>

-    <packageImport xmi:type="cmof:PackageImport" xmi:id="_packageImport.0" importingNamespace="_0">

-      <importedPackage xmi:type="cmof:Package" href="DC.cmof#_0"/>

-    </packageImport>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Canvas" name="Canvas" superClass="Group">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Canvas-_ownedComment.0" annotatedElement="Canvas">

-        <body>Canvas is a kind of group that has bounds.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_roVmMOjLEeO6TvQHODg78w" name="canvas_cannot_have_transforms" constrainedElement="Canvas" namespace="Canvas">

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_roVmMejLEeO6TvQHODg78w">

-          <language>OCL</language>

-          <body>transform->isEmpty()</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_loGuQNTkEeO3TMM_EGdzeA" name="bounds" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_loGuQdTkEeO3TMM_EGdzeA" annotatedElement="_loGuQNTkEeO3TMM_EGdzeA">

-          <body>the bounds of the canvas in the x-y coordinate system.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Bounds"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Circle" name="Circle" superClass="GraphicalElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Circle-_ownedComment.0" annotatedElement="Circle">

-        <body>Circle is a graphical element that defines a circular shape with a given center point and a radius.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="Circle-non_negative_radius" name="non_negative_radius" constrainedElement="Circle" namespace="Circle">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Circle-non_negative_radius-_ownedComment.0" annotatedElement="Circle-non_negative_radius">

-          <body>The radius of a circle cannot be negative</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="Circle-non_negative_radius-_specification">

-          <language>OCL</language>

-          <body>radius >= 0</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Circle-center" name="center" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Circle-center-_ownedComment.0" annotatedElement="Circle-center">

-          <body>the center point of the circle in the x-y coordinate system.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Circle-radius" name="radius" visibility="public" default="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Circle-radius-_ownedComment.0" annotatedElement="Circle-radius">

-          <body>a real number (>=0) that represents the radius of the circle.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="ClipPath" name="ClipPath" superClass="Group">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="ClipPath-_ownedComment.0" annotatedElement="ClipPath">

-        <body>ClipPath is a kind of group whose members collectively define a painting mask for its referencing graphical elements.</body>

-      </ownedComment>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="ClosePath" name="ClosePath" superClass="PathCommand">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="ClosePath-_ownedComment.0" annotatedElement="ClosePath">

-        <body>ClosePath is a kind of path command that ends the current subpath and causes an automatic straight line to be drawn from the current point to the initial point of the current subpath.</body>

-      </ownedComment>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="CubicCurveTo" name="CubicCurveTo" superClass="PathCommand">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="CubicCurveTo-_ownedComment.0" annotatedElement="CubicCurveTo">

-        <body>CubicCurveTo is a kind of path command that draws a cubic bézier curve from the current point to a new point using a start and an end control points.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="CubicCurveTo-startControl" name="startControl" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="CubicCurveTo-startControl-_ownedComment.0" annotatedElement="CubicCurveTo-startControl">

-          <body>the start control point of the cubic bézier curve.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="CubicCurveTo-endControl" name="endControl" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="CubicCurveTo-endControl-_ownedComment.0" annotatedElement="CubicCurveTo-endControl">

-          <body>the end control point of the cubic bézier curve.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="CubicCurveTo-point" name="point" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="CubicCurveTo-point-_ownedComment.0" annotatedElement="CubicCurveTo-point">

-          <body>a point to draw a cubic bézier curve to from the current point in the coordinate system.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="_CwockM6jEeOqlr8E3pzO9g" name="Definition" isAbstract="true">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="_k77BMM6jEeOqlr8E3pzO9g" annotatedElement="MoveTo">

-        <body>Definition is an object with an id that can be nested under Definitions.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_0yDOEO08EeOCPtJ2AfZp5A" name="id_cannot_be_empty" constrainedElement="_CwockM6jEeOqlr8E3pzO9g" namespace="_CwockM6jEeOqlr8E3pzO9g">

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_0yDOEe08EeOCPtJ2AfZp5A">

-          <language>OCL</language>

-          <body>id->notEmpty() implies id.size() > 0</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_3JUlwM6jEeOqlr8E3pzO9g" name="id" visibility="public" lower="0" isID="true">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_3JUlwc6jEeOqlr8E3pzO9g" annotatedElement="_3JUlwM6jEeOqlr8E3pzO9g">

-          <body>a point to move to in the coordinate system</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#String"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="_DH0DwM5yEeOqlr8E3pzO9g" name="Definitions">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="_dKczUM5_EeOqlr8E3pzO9g" annotatedElement="CubicCurveTo">

-        <body>Definitions nests definitions that are commonly referenced in the containing canvas. It can also nest an embedded stylesheet.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_zSdxIM5wEeOqlr8E3pzO9g" name="defnition" visibility="public" type="_CwockM6jEeOqlr8E3pzO9g" isOrdered="true" lower="0" upper="*" isComposite="true" association="_Nti6EM53EeOqlr8E3pzO9g">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_zSdxIc5wEeOqlr8E3pzO9g" annotatedElement="_zSdxIM5wEeOqlr8E3pzO9g">

-          <body>A set of clip paths that are referenced by graphical elements in the containing canvas.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Canvas-packagedStyle" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" lower="0" isComposite="true" association="_packagedElement.47">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Canvas-packagedStyle-_ownedComment.0" annotatedElement="Canvas-packagedStyle">

-          <body>An optional embdded style sheet that that apply to graphical elements in the containing canvas.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Ellipse" name="Ellipse" superClass="GraphicalElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Ellipse-_ownedComment.0" annotatedElement="Ellipse">

-        <body>Ellipse is a graphical element that defines an elliptical shape with a given center point and two radii on the x and y axes.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Ellipse-center" name="center" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Ellipse-center-_ownedComment.0" annotatedElement="Ellipse-center">

-          <body>the center point of the ellipse in the x-y coordinate system.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Ellipse-radii" name="radii" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Ellipse-radii-_ownedComment.0" annotatedElement="Ellipse-radii">

-          <body>a dimension that specifies the two radii of the ellipse (a width along the x-axis and a height along the y-axis)</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Dimension"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="EllipticalArcTo" name="EllipticalArcTo" superClass="PathCommand">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="EllipticalArcTo-_ownedComment.0" annotatedElement="CubicCurveTo QuadraticCurveTo">

-        <body>EllipticalArcTo is a kind of path command that draws an elliptical arc from the current point to a new point in the coordinate system.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="EllipticalArcTo-radii" name="radii" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="EllipticalArcTo-radii-_ownedComment.0" annotatedElement="EllipticalArcTo-radii">

-          <body>the two radii of the ellipse from which the arc is created.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Dimension"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="EllipticalArcTo-rotation" name="rotation" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="EllipticalArcTo-rotation-_ownedComment.0" annotatedElement="EllipticalArcTo-rotation">

-          <body>a real number representing a rotation (in degrees) of the ellipse from which the arc is created.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="EllipticalArcTo-isLargeArc" name="isLargeArc" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="EllipticalArcTo-isLargeArc-_ownedComment.0" annotatedElement="EllipticalArcTo-isLargeArc">

-          <body>whether the arc sweep is equal to or greater than 180 degrees (the large arc).</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Boolean"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="EllipticalArcTo-isSweep" name="isSweep" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="EllipticalArcTo-isSweep-_ownedComment.0" annotatedElement="EllipticalArcTo-isSweep">

-          <body>whether the arc is drawn in a positive-angle direction</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Boolean"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="EllipticalArcTo-point" name="point" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="EllipticalArcTo-point-_ownedComment.0" annotatedElement="EllipticalArcTo-point">

-          <body>a point to draw an elliptical arc to from the current point in the coordinate system.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Gradient" name="Gradient" isAbstract="true" superClass="Fill">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Gradient-_ownedComment.0" annotatedElement="Gradient">

-        <body>Gradient is a kind of paint server that serves a continuously smooth color transition along the gradient range from one color to the next.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Gradient-stop" name="stop" visibility="public" type="GradientStop" isOrdered="true" lower="2" upper="*" isComposite="true" association="_hQOVgM41EeOqlr8E3pzO9g">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Gradient-stop-_ownedComment.0" annotatedElement="Gradient-stop">

-          <body>a list of two or more gradient stops defining the color transitions of the gradient.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="GradientStop" name="GradientStop">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="GradientStop-_ownedComment.0" annotatedElement="GradientStop">

-        <body>GradientStop defines a color transition along the distance from a gradient's start to its end offsets.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="GradientStop-valid_offset" name="valid_offset" constrainedElement="GradientStop" namespace="GradientStop">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="GradientStop-valid_offset-_ownedComment.0" annotatedElement="GradientStop-valid_offset">

-          <body>the offset must be between 0 and 1.</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="GradientStop-valid_offset-_specification">

-          <language>OCL</language>

-          <body>offset>=0 and offset&lt;=1</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="GradientStop-valid_opacity" name="valid_opacity" constrainedElement="GradientStop" namespace="GradientStop">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="GradientStop-valid_opacity-_ownedComment.0" annotatedElement="GradientStop-valid_opacity">

-          <body>the opacity must be between 0 and 1.</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="GradientStop-valid_opacity-_specification">

-          <language>OCL</language>

-          <body>opacity>=0 and opacity&lt;=1</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="GradientStop-color" name="color" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="GradientStop-color-_ownedComment.0" annotatedElement="GradientStop-color">

-          <body>the color to use at this gradient stop.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Color"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="GradientStop-offset" name="offset" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="GradientStop-offset-_ownedComment.0" annotatedElement="GradientStop-offset">

-          <body>an offset of this gradient stop represented as a percentage of the distance between the start and end positions of the gradient along the x and y axes.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="GradientStop-opacity" name="opacity" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="GradientStop-opacity-_ownedComment.0" annotatedElement="GradientStop-opacity">

-          <body>a real number (>=0 and&lt;=1) representing the opacity of the color at the stop. A value of 0 means totally transparent, while a value of 1 means totally opaque.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="GraphicalElement" name="GraphicalElement" isAbstract="true" superClass="_CwockM6jEeOqlr8E3pzO9g">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="GraphicalElement-_ownedComment.0" annotatedElement="GraphicalElement">

-        <body>GraphicalElement is the abstract superclass of all graphical elements that can be nested in a canvas.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_-a2yAOhzEeO6TvQHODg78w" name="referenced_clippath_has_id" constrainedElement="GraphicalElement" namespace="GraphicalElement">

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_I9m_EOh0EeO6TvQHODg78w">

-          <language>OCL</language>

-          <body>clipPath->notEmpty() implies clipPath.id->notEmpty()</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="GraphicalElement-clipPath" name="clipPath" visibility="public" type="ClipPath" lower="0" association="A_clipPath_clippedElement">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="GraphicalElement-clipPath-_ownedComment.0" annotatedElement="GraphicalElement-clipPath">

-          <body>A clip path that masks the painting of this graphical element.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="GraphicalElement-group" name="group" visibility="public" type="Group" lower="0" association="A_member_group">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="GraphicalElement-group-_ownedComment.0" annotatedElement="GraphicalElement-group">

-          <body>The group that owns this graphical element.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_yyXeMM2TEeOtK5GsJlm5Mw" name="class" visibility="public" isOrdered="true" lower="0" upper="*">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_yyXeMc2TEeOtK5GsJlm5Mw" annotatedElement="_yyXeMM2TEeOtK5GsJlm5Mw">

-          <body>A list of strings representing classes of the graphical element.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#String"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="GraphicalElement-localStyle" name="style" visibility="public" type="Style" isOrdered="true" lower="0" isComposite="true" association="A_localStyle_styledElement">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="GraphicalElement-localStyle-_ownedComment.0" annotatedElement="GraphicalElement-localStyle">

-          <body>An inline style that applies on this graphical element.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="GraphicalElement-transform" name="transform" visibility="public" type="Transform" isOrdered="true" lower="0" upper="*" isComposite="true" association="_TVnmYM42EeOqlr8E3pzO9g">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="GraphicalElement-transform-_ownedComment.0" annotatedElement="GraphicalElement-transform">

-          <body>A list of transforms that apply to this graphical element.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Group" name="Group" superClass="GraphicalElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Group-_ownedComment.0" annotatedElement="Group">

-        <body>Group defines a group of graphical elements that can be styled, clipped and/or transformed together.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Group-member" name="member" visibility="public" type="GraphicalElement" isOrdered="true" lower="0" upper="*" isComposite="true" association="A_member_group">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Group-member-_ownedComment.0" annotatedElement="Group-member">

-          <body>A list of graphical elements that are members of this group.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Image" name="Image" superClass="GraphicalElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Image-_ownedComment.0" annotatedElement="Image">

-        <body>Image is a graphical element that defines a shape that paints an image with a given URL within given bounds.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_6903kOjNEeO6TvQHODg78w" name="source_cannot_be_empty" constrainedElement="Image" namespace="Image">

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_6903kejNEeO6TvQHODg78w">

-          <language>OCL</language>

-          <body>source->notEmpty() implies source.size() > 0</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Image-source" name="source" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Image-source-_ownedComment.0" annotatedElement="Image-source">

-          <body>the URL of a referenced image file.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#String"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Image-bounds" name="bounds" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Image-bounds-_ownedComment.0" annotatedElement="Image-bounds">

-          <body>the bounds within which the image is rendered.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Bounds"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Image-isAspectRatioPreserved" name="isAspectRatioPreserved" visibility="public" default="false">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Image-isAspectRatioPreserved-_ownedComment.0" annotatedElement="Image-isAspectRatioPreserved">

-          <body>wether to preserve the aspect ratio of the image upon scaling, i.e. the same scale factor for width and height.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Boolean"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Line" name="Line" superClass="MarkedElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Line-_ownedComment.0" annotatedElement="Line">

-        <body>Line is a marked element that defines a shape consisting of one straight line between two points.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Line-start" name="start" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Line-start-_ownedComment.0" annotatedElement="Line-start">

-          <body>the starting point of the line in the x-y coordinate system.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Line-end" name="end" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Line-end-_ownedComment.0" annotatedElement="Line-end">

-          <body>the ending point of the line in the x-y coordinate system.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="LinearGradient" name="LinearGradient" superClass="Gradient">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="LinearGradient-_ownedComment.0" annotatedElement="LinearGradient">

-        <body>LinearGradient is a kind of gradient that fills a graphical element by smoothly changing color values along a vector.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="LinearGradient-valid_gradient_vector" name="valid_gradient_vector" constrainedElement="LinearGradient" namespace="LinearGradient">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="LinearGradient-valid_gradient_vector-_ownedComment.0" annotatedElement="LinearGradient-valid_gradient_vector">

-          <body>all the components of the gradient vector must be between 0 and 1.</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="LinearGradient-valid_gradient_vector-_specification">

-          <language>OCL</language>

-          <body>start.x>=0 and start.x&lt;=1 and end.x>=0 and end.x&lt;=1 and start.y>=0 and start.y&lt;=1 and end.y>=0 and end.y&lt;=1</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_nIr7gNpbEeOltvy1wTDHDA" name="start" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_nIr7gdpbEeOltvy1wTDHDA" annotatedElement="_nIr7gNpbEeOltvy1wTDHDA">

-          <body>a starting point for the linear gradient expressed as a percentage along the x and y axes.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_oaTUYNpbEeOltvy1wTDHDA" name="end" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_oaTUYdpbEeOltvy1wTDHDA" annotatedElement="_oaTUYNpbEeOltvy1wTDHDA">

-          <body>an ending point for the linear gradient expressed as a percentage along the x and y axes.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="LineTo" name="LineTo" superClass="PathCommand">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="LineTo-_ownedComment.0" annotatedElement="LineTo">

-        <body>LineTo is a kind of path command that draw a straight line from the current point to a new point.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="LineTo-point" name="point" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="LineTo-point-_ownedComment.0" annotatedElement="LineTo-point">

-          <body>a point to draw a straight line to from the current point in the coordinate system.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="MarkedElement" name="MarkedElement" isAbstract="true" superClass="GraphicalElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="MarkedElement-_ownedComment.0" annotatedElement="MarkedElement">

-        <body>MarkedElement is a graphic element that can be decorated at its vertices with markers (e.g. arrowheads).</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_wycJoOh1EeO6TvQHODg78w" name="referenced_start_marker_has_id" constrainedElement="MarkedElement" namespace="MarkedElement">

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_wycJoeh1EeO6TvQHODg78w">

-          <language>OCL</language>

-          <body>startMarker->notEmpty() implies startMarker.id->notEmpty()</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_8rYGgOh1EeO6TvQHODg78w" name="referenced_mid_marker_has_id" constrainedElement="MarkedElement" namespace="MarkedElement">

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_8rYGgeh1EeO6TvQHODg78w">

-          <language>OCL</language>

-          <body>midMarker->notEmpty() implies midMarker.id->notEmpty()</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_B10LEOh2EeO6TvQHODg78w" name="referenced_end_marker_has_id" constrainedElement="MarkedElement" namespace="MarkedElement">

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_B10LEeh2EeO6TvQHODg78w">

-          <language>OCL</language>

-          <body>endMarker->notEmpty() implies endMarker.id->notEmpty()</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="MarkedElement-endMarker" name="endMarker" visibility="public" type="Marker" lower="0" association="A_endMarker_markedElement">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="MarkedElement-endMarker-_ownedComment.0" annotatedElement="MarkedElement-endMarker">

-          <body>an optional end marker that aligns with the last vertex of the marked element.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="MarkedElement-midMarker" name="midMarker" visibility="public" type="Marker" lower="0" association="A_midMarker_markedElement">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="MarkedElement-midMarker-_ownedComment.0" annotatedElement="MarkedElement-midMarker">

-          <body>an optional mid marker that aligns with all vertices of the marked element except the first and the last.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="MarkedElement-startMarker" name="startMarker" visibility="public" type="Marker" lower="0" association="A_startMarker_markedElement">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="MarkedElement-startMarker-_ownedComment.0" annotatedElement="MarkedElement-startMarker">

-          <body>an optional start marker that aligns with the first vertex of the marked element.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Marker" name="Marker" superClass="Group">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Marker-_ownedComment.0" annotatedElement="Marker">

-        <body>Marker is a kind of group that is used as a decoration (e.g. an arrowhead) for the vertices of a marked graphical element.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Marker-size" name="size" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Marker-size-_ownedComment.0" annotatedElement="Marker-size">

-          <body>the size of the marker</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Dimension"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Marker-reference" name="reference" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Marker-reference-_ownedComment.0" annotatedElement="Marker-reference">

-          <body>a point within the bounds of the marker that aligns exactly with the marked element's vertex.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Matrix" name="Matrix" superClass="Transform">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Matrix-_ownedComment.0" annotatedElement="Matrix">

-        <body>Matrix is a kind of transform that represents any transform operation with a 3x3 transformation matrix.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Matrix-a" name="a" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Matrix-a-_ownedComment.0" annotatedElement="Matrix-a">

-          <body>the a value of the transform matrix.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Matrix-b" name="b" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Matrix-b-_ownedComment.0" annotatedElement="Matrix-b">

-          <body>the b value of the transform matrix.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Matrix-c" name="c" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Matrix-c-_ownedComment.0" annotatedElement="Matrix-c">

-          <body>the c value of the transform matrix.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Matrix-d" name="d" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Matrix-d-_ownedComment.0" annotatedElement="Matrix-d">

-          <body>the d value of the transform matrix.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Matrix-e" name="e" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Matrix-e-_ownedComment.0" annotatedElement="Matrix-e">

-          <body>the e value of the transform matrix.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Matrix-f" name="f" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Matrix-f-_ownedComment.0" annotatedElement="Matrix-f">

-          <body>the f value of the transform matrix.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="MoveTo" name="MoveTo" superClass="PathCommand">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="MoveTo-_ownedComment.0" annotatedElement="MoveTo">

-        <body>MoveTo is a kind of path command that establishes a new current point in the coordinate system.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="MoveTo-point" name="point" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="MoveTo-point-_ownedComment.0" annotatedElement="MoveTo-point">

-          <body>a point to move to in the coordinate system</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="_wz9hsM2cEeOtK5GsJlm5Mw" name="Paint">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="_C_Q0gM2dEeOtK5GsJlm5Mw">

-        <body>Paint is used to fill or stroke a graphical element.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_R3fe8Oh2EeO6TvQHODg78w" name="referenced_paint_server_has_id" constrainedElement="_wz9hsM2cEeOtK5GsJlm5Mw" namespace="_wz9hsM2cEeOtK5GsJlm5Mw">

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_R3fe8eh2EeO6TvQHODg78w">

-          <language>OCL</language>

-          <body>paintServer->notEmpty() implies paintServer.id->notEmpty()</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_Mg5i0M2dEeOtK5GsJlm5Mw" name="color" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_Mg5i0c2dEeOtK5GsJlm5Mw" annotatedElement="_Mg5i0M2dEeOtK5GsJlm5Mw">

-          <body>A solid color to use in painting.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Color"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_dR8eIM2dEeOtK5GsJlm5Mw" name="paintServer" visibility="public" type="Fill" lower="0" association="_VGk7AM2kEeOtK5GsJlm5Mw">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_dR8eIc2dEeOtK5GsJlm5Mw" annotatedElement="_dR8eIM2dEeOtK5GsJlm5Mw">

-          <body>A paint server that is used in painting.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Fill" name="PaintServer" isAbstract="true" superClass="_CwockM6jEeOqlr8E3pzO9g">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Fill-_ownedComment.0" annotatedElement="Fill">

-        <body>PaintServer is the abstract super class of all paint servers, like gradients and patterns</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Fill-transform" name="transform" visibility="public" type="Transform" isOrdered="true" lower="0" upper="*" isComposite="true" association="_oEGFIM55EeOqlr8E3pzO9g">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Fill-transform-_ownedComment.0" annotatedElement="Fill-transform">

-          <body>A set of transforms that apply to this paint server.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Path" name="Path" superClass="MarkedElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Path-_ownedComment.0" annotatedElement="Path">

-        <body>Path is a marked element that defines a custom shape whose geometry is specified with a sequence of path commands.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_uJDzUOjHEeO6TvQHODg78w" name="first_command_must_be_move" constrainedElement="Path" namespace="Path">

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_Omo48OjIEeO6TvQHODg78w">

-          <language>OCL</language>

-          <body>command->first().oclIsKindOf(MoveTo)</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Path-command" name="command" visibility="public" type="PathCommand" isOrdered="true" upper="*" isComposite="true" association="_-INckM55EeOqlr8E3pzO9g">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Path-command-_ownedComment.0" annotatedElement="Path-command">

-          <body>a list of path commands that define the geometry of the custom shape.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="PathCommand" name="PathCommand" isAbstract="true">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="PathCommand-_ownedComment.0" annotatedElement="PathCommand">

-        <body>PathCommand is the abstract super type of all commands that participate in specifying a path element.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="PathCommand-isRelative" name="isRelative" visibility="public" default="false">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="PathCommand-isRelative-_ownedComment.0" annotatedElement="PathCommand-isRelative">

-          <body>whether the coordinates specified by the command are relative to the current point (when true) or to the origin point of the coordinate system (when false).</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Boolean"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Pattern" name="Pattern" superClass="Fill">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Pattern-_ownedComment.0" annotatedElement="Pattern">

-        <body>Pattern is a kind of paint server that paints a graphical element (a tile) repeatedly at fixed intervals in x and y axes to cover the areas to be filled.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Pattern-bounds" name="bounds" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Pattern-bounds-_ownedComment.0" annotatedElement="Pattern-bounds">

-          <body>the bounds of the pattern that define a private coordinate system for the pattern's tile.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Bounds"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Pattern-tile" name="tile" visibility="public" type="GraphicalElement" isComposite="true" association="A_tile_pattern">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Pattern-tile-_ownedComment.0" annotatedElement="Pattern-tile">

-          <body>a reference to a graphical element, owned by the pattern, that works as a tile to be painted repeatedly at a fixed interval to fill an closed area.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Polygon" name="Polygon" superClass="MarkedElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Polygon-_ownedComment.0" annotatedElement="Polygon">

-        <body>Polygon is a marked element that defines a closed shape consisting of a sequence of connected straight line segments.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Polygon-point" name="point" visibility="public" isOrdered="true" lower="3" upper="*">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Polygon-point-_ownedComment.0" annotatedElement="Polygon-point">

-          <body>a list of 3 or more points making up the polygon.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Polyline" name="Polyline" superClass="MarkedElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Polyline-_ownedComment.0" annotatedElement="Polyline">

-        <body>Polyline is a marked element that defines a shape consisting of a sequence of connected straight line segments.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Polyline-point" name="point" visibility="public" isOrdered="true" lower="2" upper="*">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Polyline-point-_ownedComment.0" annotatedElement="Polyline-point">

-          <body>a list of 2 or more points making up the polyline.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="QuadraticCurveTo" name="QuadraticCurveTo" superClass="PathCommand">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="QuadraticCurveTo-_ownedComment.0" annotatedElement="CubicCurveTo QuadraticCurveTo">

-        <body>QuadraticCurveTo is a kind of path command that draws a quadratic bézier curve from the current point to a new point using a single control point.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="QuadraticCurveTo-control" name="control" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="QuadraticCurveTo-control-_ownedComment.0" annotatedElement="QuadraticCurveTo-control">

-          <body>the control point of the quadratic bézier curve.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="QuadraticCurveTo-point" name="point" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="QuadraticCurveTo-point-_ownedComment.0" annotatedElement="QuadraticCurveTo-point">

-          <body>a point to draw a quadratic bézier curve to from the current point in the coordinate system.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="RadialGradient" name="RadialGradient" superClass="Gradient">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="RadialGradient-_ownedComment.0" annotatedElement="RadialGradient">

-        <body>RadialGradient is a kind of gradient that fills a graphical element by smoothly changing color values in a circle.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="RadialGradient-valid_center_point" name="valid_center_point" constrainedElement="RadialGradient" namespace="RadialGradient">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="RadialGradient-valid_center_point-_ownedComment.0" annotatedElement="RadialGradient-valid_center_point">

-          <body>the center point coordinates must be between 0 and 1</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="RadialGradient-valid_center_point-_specification">

-          <language>OCL</language>

-          <body>centerX>=0 and centerX&lt;=1 and centerY>=0 and centerY&lt;=1</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="RadialGradient-valid_focus_point" name="valid_focus_point" constrainedElement="RadialGradient" namespace="RadialGradient">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="RadialGradient-valid_focus_point-_ownedComment.0" annotatedElement="RadialGradient-valid_focus_point">

-          <body>the focus point coordinates must be between 0 and 1</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="RadialGradient-valid_focus_point-_specification">

-          <language>OCL</language>

-          <body>focusX>=0 and focusX&lt;=1 and focusY>=0 and focusY&lt;=1</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="RadialGradient-valid_radius" name="valid_radius" constrainedElement="RadialGradient" namespace="RadialGradient">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="RadialGradient-valid_radius-_ownedComment.0" annotatedElement="RadialGradient-valid_radius">

-          <body>the radius  must be between 0 and 1</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="RadialGradient-valid_radius-_specification">

-          <language>OCL</language>

-          <body>radius>=0 and radius&lt;=1</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_u_spINpdEeOltvy1wTDHDA" name="center" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_u_spIdpdEeOltvy1wTDHDA" annotatedElement="_u_spINpdEeOltvy1wTDHDA">

-          <body>a center point for the radial gradient expressed as a percentage along the x and y axes.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_0SIMENpdEeOltvy1wTDHDA" name="focus" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_0SIMEdpdEeOltvy1wTDHDA" annotatedElement="_0SIMENpdEeOltvy1wTDHDA">

-          <body>a focus point for the radial gradient expressed as a percentage along the x and y axes.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="RadialGradient-radius" name="radius" visibility="public" default="0.5">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="RadialGradient-radius-_ownedComment.0" annotatedElement="RadialGradient-radius">

-          <body>a real number (>=0 and >=1) representing a ratio of the graphical element's size that is the radius of the gradient.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Rectangle" name="Rectangle" superClass="GraphicalElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Rectangle-_ownedComment.0" annotatedElement="Rectangle">

-        <body>Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_qFi4AOhuEeO6TvQHODg78w" name="non_negative_corner_radius" constrainedElement="Rectangle" namespace="Rectangle">

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_qFi4AehuEeO6TvQHODg78w">

-          <language>OCL</language>

-          <body>cornerRadius >= 0</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Rectangle-bounds" name="bounds" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Rectangle-bounds-_ownedComment.0" annotatedElement="Rectangle-bounds">

-          <body>the bounds of the rectangle in the x-y coordinate system.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Bounds"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Rectangle-cornerRadius" name="cornerRadius" visibility="public" lower="0" default="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Rectangle-cornerRadius-_ownedComment.0" annotatedElement="Rectangle-cornerRadius">

-          <body>a radius for the rectangle's rounded corners. When the radius is 0, the rectangle is drawn with sharp corners.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="_jfIkENesEeOsUY1jE2-lpg" name="RootCanvas" superClass="Canvas">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="_jfIkEdesEeOsUY1jE2-lpg" annotatedElement="_jfIkENesEeOsUY1jE2-lpg">

-        <body>RootCanvas is a kind of canvas that represents the root of containment for all graphical elements that render together.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_jfIkE9esEeOsUY1jE2-lpg" name="backgroundColor" visibility="public" lower="0" isComposite="true">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_jfIkFNesEeOsUY1jE2-lpg" annotatedElement="_jfIkE9esEeOsUY1jE2-lpg">

-          <body>An optional paint for the background of the canvas.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Color"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_jfIkFtesEeOsUY1jE2-lpg" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" isOrdered="true" lower="0" isComposite="true" association="_qUuAwM51EeOqlr8E3pzO9g">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_jfIkF9esEeOsUY1jE2-lpg" annotatedElement="_jfIkFtesEeOsUY1jE2-lpg">

-          <body>An optional definitions element to hold objects commonly referenced by the canvas.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_jfIkGdesEeOsUY1jE2-lpg" name="externalStyleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" isOrdered="true" lower="0" upper="*" association="_VJB6MM41EeOqlr8E3pzO9g">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_jfIkGtesEeOsUY1jE2-lpg" annotatedElement="_jfIkGdesEeOsUY1jE2-lpg">

-          <body>A list of external style sheets that are imported by the canvas.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Rotate" name="Rotate" superClass="Transform">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Rotate-_ownedComment.0" annotatedElement="Rotate">

-        <body>Rotate is a kind of transform that rotates a graphical element by a given angle about a given center point in the x-y coordinate system.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Rotate-angle" name="angle" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Rotate-angle-_ownedComment.0" annotatedElement="Rotate-angle">

-          <body>a real number representing the angle (in degrees) of rotation. Both positive (clock-wise) and negative (counter-clock-wise) values are allowed.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Rotate-center" name="center" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Rotate-center-_ownedComment.0" annotatedElement="Rotate-center">

-          <body>a point in the x-y coordinate system about which the rotation is performed. If the point is not specified, it is assumed to be the origin of the x-y coordinate system.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Scale" name="Scale" superClass="Transform">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Scale-_ownedComment.0" annotatedElement="Scale">

-        <body>Scale is a kind of transform that scales (resizes) a graphical element by a given factor in the x-y coordinate system.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="Scale-non-negative-scale" name="non-negative-scale" constrainedElement="Scale" namespace="Scale">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Scale-non-negative-scale-_ownedComment.0" annotatedElement="Scale-non-negative-scale">

-          <body>scale factors cannot be negative.</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="Scale-non-negative-scale-_specification">

-          <language>OCL</language>

-          <body>factorX>=0 and factorY>=0</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Scale-factorX" name="factorX" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Scale-factorX-_ownedComment.0" annotatedElement="Scale-factorX">

-          <body>a real number (>=0) representing a scale factor along the x-axis.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Scale-factorY" name="factorY" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Scale-factorY-_ownedComment.0" annotatedElement="Scale-factorY">

-          <body>a real number(>=0) representing a scale factor along the y-axis.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Skew" name="Skew" superClass="Transform">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Skew-_ownedComment.0" annotatedElement="Skew">

-        <body>Skew is a kind of transform that skews (deforms) a graphical element by given angles in the x-y coordinate system.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Skew-angleX" name="angleX" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Skew-angleX-_ownedComment.0" annotatedElement="Skew-angleX">

-          <body>a real number representing the angle (in degrees) of skew along the x-axis. Both positive (clock-wise) and negative (counter-clock-wise) values are allowed.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Skew-angleY" name="angleY" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Skew-angleY-_ownedComment.0" annotatedElement="Skew-angleY">

-          <body>a real number representing the angle (in degrees) of skew along the y-axis. Both positive (clock-wise) and negative (counter-clock-wise) values are allowed.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Style" name="Style">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Style-_ownedComment.0" annotatedElement="Style">

-        <body>Style contains formatting properties that affect the appearance or style of graphical elements.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="Style-valid_font_size" name="valid_font_size" namespace="Style">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-valid_font_size-_ownedComment.0" annotatedElement="Style-valid_font_size">

-          <body>the font size is non-negative</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="Style-valid_font_size-_specification">

-          <language>OCL</language>

-          <body>fontSize >=  0</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="Style-valid_fill_opacity" name="valid_fill_opacity" namespace="Style">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-valid_fill_opacity-_ownedComment.0" annotatedElement="Style-valid_fill_opacity">

-          <body>the stroke width is non-negative</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="Style-valid_fill_opacity-_specification">

-          <language>OCL</language>

-          <body>fillOpacity >=  0 and fillOpacity &lt;=1</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="Style-valid_stroke_width" name="valid_stroke_width" namespace="Style">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-valid_stroke_width-_ownedComment.0" annotatedElement="Style-valid_stroke_width">

-          <body>the stroke width is non-negative</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="Style-valid_stroke_width-_specification">

-          <language>OCL</language>

-          <body>strokeWidth >=  0</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="Style-valid_dash_length_size" name="valid_dash_length_size" namespace="Style">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-valid_dash_length_size-_ownedComment.0" annotatedElement="Style-valid_dash_length_size">

-          <body>the size of the stroke dash length list must be even.</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="Style-valid_dash_length_size-_specification">

-          <language>OCL</language>

-          <body>strokeDashLength->size().mod(2) = 0</body>

-        </specification>

-      </ownedRule>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="Style-valid_stroke_opacity" name="valid_stroke_opacity" namespace="Style">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-valid_stroke_opacity-_ownedComment.0" annotatedElement="Style-valid_stroke_opacity">

-          <body>the opacity of the fill is non-negative</body>

-        </ownedComment>

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="Style-valid_stroke_opacity-_specification">

-          <language>OCL</language>

-          <body>strokeOpacity >=  0 and strokeOpacity &lt;=1</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Style-fill" name="fill" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" lower="0" isComposite="true" association="A_fill_style">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-fill-_ownedComment.0" annotatedElement="Style-fill">

-          <body>A paint that is used to fill the enclosed regions of a graphical element. The default is a black paint.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Style-fillOpacity" name="fillOpacity" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-fillOpacity-_ownedComment.0" annotatedElement="Style-fillOpacity">

-          <body>A real number (>=0 and &lt;=1) representing the opacity of the fill used to paint a graphical element. A value of 0 means totally transparent, while a value of 1 means totally opaque. The default is 1.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_KemS4M2oEeOtK5GsJlm5Mw" name="stroke" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" lower="0" isComposite="true" association="_KeO_IM2rEeOtK5GsJlm5Mw">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_KemS4c2oEeOtK5GsJlm5Mw" annotatedElement="_KemS4M2oEeOtK5GsJlm5Mw">

-          <body>A paint that is used to stroke a graphical element. The default is no paint.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Style-strokeWidth" name="strokeWidth" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-strokeWidth-_ownedComment.0" annotatedElement="Style-strokeWidth">

-          <body>A real number (>=0) representing the width of the stroke of a graphical element. A value of 0 specifies no stroke is painted. The default is 1.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Style-strokeOpacity" name="strokeOpacity" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-strokeOpacity-_ownedComment.0" annotatedElement="Style-strokeOpacity">

-          <body>A real number (>=0 and &lt;=1) representing the opacity of the stroke of a graphical element. A value of 0 means totally transparent, while a value of 1 means totally opaque. The default is 1.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Style-strokeDashLength" name="strokeDashLength" visibility="public" isOrdered="true" isUnique="false" lower="0" upper="*">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-strokeDashLength-_ownedComment.0" annotatedElement="Style-strokeDashLength">

-          <body>A list of real numbers specifying a pattern of alternating dash and gap lengths used in stroking the outline of a graphical element with the first one specifying a dash length. The size of the list is expected to be even. If the list is empty, the stroke is drawn solid. The default is empty list.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Style-fontSize" name="fontSize" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-fontSize-_ownedComment.0" annotatedElement="Style-fontSize">

-          <body>A real number (>=0) representing the size (in unit of length) of the font used to render a text element. The default is 10.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Style-fontName" name="fontName" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-fontName-_ownedComment.0" annotatedElement="Style-fontName">

-          <body>The name of the font used to render a text element (e.g. &quot;Times New Roman&quot;, &quot;Arial&quot; or &quot;Helvetica&quot;). The default is &quot;Arial&quot;.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#String"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Style-fontItalic" name="fontItalic" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-fontItalic-_ownedComment.0" annotatedElement="Style-fontItalic">

-          <body>Whether the font used to render a text element has an italic style. The default is false.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Boolean"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Style-fontBold" name="fontBold" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-fontBold-_ownedComment.0" annotatedElement="Style-fontBold">

-          <body>Whether the font used to render a text element has a bold style. The default is false.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Boolean"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Style-fontStrikeThrough" name="fontDecoration" visibility="public" type="_wgzj4M2WEeOtK5GsJlm5Mw" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Style-fontStrikeThrough-_ownedComment.0" annotatedElement="Style-fontStrikeThrough">

-          <body>The decoration of the font used to render a text element. The default is no decoration.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="_9z_BQM2CEeOX1ohrWoozJQ" name="StyleRule">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="_XHdkwM2QEeOtK5GsJlm5Mw">

-        <body>StyleRule selects a set of graphical elements and applies a style to them.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_2CcQMM2FEeOX1ohrWoozJQ" name="selector" visibility="public" type="_ClirwM2DEeOX1ohrWoozJQ" isOrdered="true" upper="*" isComposite="true" association="_OTgnYM2GEeOX1ohrWoozJQ">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_2CcQMc2FEeOX1ohrWoozJQ" annotatedElement="_2CcQMM2FEeOX1ohrWoozJQ">

-          <body>A set of selectors for graphical elements to apply the rule to.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_DFi6IM2GEeOX1ohrWoozJQ" name="style" visibility="public" type="Style" isComposite="true" association="_vnz5oM2GEeOX1ohrWoozJQ">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_DFi6Ic2GEeOX1ohrWoozJQ" annotatedElement="_DFi6IM2GEeOX1ohrWoozJQ">

-          <body>A style that is applied to graphical elements selected by this rule.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="_ClirwM2DEeOX1ohrWoozJQ" name="StyleSelector">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="_FfB5AM2REeOtK5GsJlm5Mw">

-        <body>StyleSelector defines criteria that matches a set of graphical elements.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_OsgrUM2IEeOX1ohrWoozJQ" name="kind" visibility="public" type="_6aYm0OgeEeO6TvQHODg78w" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_OsgrUc2IEeOX1ohrWoozJQ" annotatedElement="_OsgrUM2IEeOX1ohrWoozJQ">

-          <body>The kind of graphical element to select.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_Y03bYM2IEeOX1ohrWoozJQ" name="class" visibility="public" isOrdered="true" lower="0" upper="*">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_Y03bYc2IEeOX1ohrWoozJQ" annotatedElement="_Y03bYM2IEeOX1ohrWoozJQ">

-          <body>A set of strings representing classes of graphical elements to select. Selected elements must have all those classes.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#String"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="_4ytfwM2CEeOX1ohrWoozJQ" name="StyleSheet">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="_WuWzIM2OEeOtK5GsJlm5Mw">

-        <body>StyleSheet defines a list of style rules that apply to graphical elements in a canvas.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_TqPtcM2EEeOX1ohrWoozJQ" name="rule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" isOrdered="true" lower="0" upper="*" isComposite="true" association="_QZkcUM2DEeOX1ohrWoozJQ">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_TqPtcc2EEeOX1ohrWoozJQ" annotatedElement="_TqPtcM2EEeOX1ohrWoozJQ">

-          <body>A list of style rules that apply to graphical elements.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Text" name="Text" superClass="GraphicalElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Text-_ownedComment.0" annotatedElement="Text">

-        <body>Text is a graphical element that defines a shape that renders a character string at a given position.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_dPn0oO0zEeOCPtJ2AfZp5A" name="data_cannot_be_empty" constrainedElement="Text" namespace="Text">

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_dPn0oe0zEeOCPtJ2AfZp5A">

-          <language>OCL</language>

-          <body>data->notEmpty() implies data.size() > 0</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Text-data" name="data" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Text-data-_ownedComment.0" annotatedElement="Text-data">

-          <body>the text as a string of characters.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#String"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Text-bounds" name="position" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Text-bounds-_ownedComment.0" annotatedElement="Text-bounds">

-          <body>the bounds inside which the text is rendered (possibly wrapped into multiple lines)</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Transform" name="Transform" isAbstract="true">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Transform-_ownedComment.0" annotatedElement="Transform">

-        <body>Transform defines an operation that changes the geometry of a graphical element in a specific way.</body>

-      </ownedComment>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Translate" name="Translate" superClass="Transform">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Translate-_ownedComment.0" annotatedElement="Translate">

-        <body>Translate is a kind of transform that translates (moves) a graphical element by a given delta along the x-y coordinate system.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Translate-deltaX" name="deltaX" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Translate-deltaX-_ownedComment.0" annotatedElement="Translate-deltaX">

-          <body>a real number representing a translate delta along the x-axis. Both positive and negative values are allowed.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Translate-deltaY" name="deltaY" visibility="public">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Translate-deltaY-_ownedComment.0" annotatedElement="Translate-deltaY">

-          <body>a real number representing a translate delta along the y-axis. Both positive and negative values are allowed.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="_wGwIsNeoEeOgmPOh7kSfHA" name="Use" superClass="GraphicalElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="_wGwIsdeoEeOgmPOh7kSfHA" annotatedElement="_wGwIsNeoEeOgmPOh7kSfHA">

-        <body>Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius.</body>

-      </ownedComment>

-      <ownedRule xmi:type="cmof:Constraint" xmi:id="_oxx7UOh0EeO6TvQHODg78w" name="referenced_element_has_id" constrainedElement="_wGwIsNeoEeOgmPOh7kSfHA" namespace="_wGwIsNeoEeOgmPOh7kSfHA">

-        <specification xmi:type="cmof:OpaqueExpression" xmi:id="_oxx7Ueh0EeO6TvQHODg78w">

-          <language>OCL</language>

-          <body>referencedElement->notEmpty() implies referencedElement.id->notEmpty()</body>

-        </specification>

-      </ownedRule>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_wGwIs9eoEeOgmPOh7kSfHA" name="bounds" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_wGwItNeoEeOgmPOh7kSfHA" annotatedElement="_wGwIs9eoEeOgmPOh7kSfHA">

-          <body>the bounds of the rectangle in the x-y coordinate system.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Bounds"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="_im5DIOHhEeO71tdCkM4EDw" name="referencedElement" visibility="public" type="GraphicalElement" isOrdered="true" association="_zbtccOHnEeO71tdCkM4EDw">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_im5DIeHhEeO71tdCkM4EDw" annotatedElement="_im5DIOHhEeO71tdCkM4EDw">

-          <body>A list of graphical elements that are members of this group.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Enumeration" xmi:id="_wgzj4M2WEeOtK5GsJlm5Mw" name="FontDecoration">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="_2Xj74M2WEeOtK5GsJlm5Mw">

-        <body>The kind of decoration applied to a font.</body>

-      </ownedComment>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_BWypkM2XEeOtK5GsJlm5Mw" name="underline" classifier="#_wgzj4M2WEeOtK5GsJlm5Mw" enumeration="_wgzj4M2WEeOtK5GsJlm5Mw">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_EPxo4M2XEeOtK5GsJlm5Mw">

-          <body>The font is underlined.</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_G7EKcM2XEeOtK5GsJlm5Mw" name="overline" classifier="#_wgzj4M2WEeOtK5GsJlm5Mw" enumeration="_wgzj4M2WEeOtK5GsJlm5Mw">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_G7EKcc2XEeOtK5GsJlm5Mw">

-          <body>The font is overlined.</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_HEvq4M2XEeOtK5GsJlm5Mw" name="lineThrough" classifier="#_wgzj4M2WEeOtK5GsJlm5Mw" enumeration="_wgzj4M2WEeOtK5GsJlm5Mw">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_HEvq4c2XEeOtK5GsJlm5Mw">

-          <body>The font is striked through.</body>

-        </ownedComment>

-      </ownedLiteral>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Enumeration" xmi:id="_6aYm0OgeEeO6TvQHODg78w" name="ElementKind">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="_6aYm0egeEeO6TvQHODg78w">

-        <body>The kind of graphical element.</body>

-      </ownedComment>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_6aYm0ugeEeO6TvQHODg78w" name="canvas" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_6aYm0-geEeO6TvQHODg78w">

-          <body>The Canvas element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_TObvQOgfEeO6TvQHODg78w" name="circle" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_TObvQegfEeO6TvQHODg78w">

-          <body>The Circle element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_XmBakOgfEeO6TvQHODg78w" name="clipPath" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_XmBakegfEeO6TvQHODg78w">

-          <body>The ClipPath element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_iEuOEOgfEeO6TvQHODg78w" name="ellipse" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_iEuOEegfEeO6TvQHODg78w">

-          <body>The Ellipse element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_nqm4gOgfEeO6TvQHODg78w" name="group" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_nqm4gegfEeO6TvQHODg78w">

-          <body>The Group element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_n3HqgOgfEeO6TvQHODg78w" name="image" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_n3IRkOgfEeO6TvQHODg78w">

-          <body>The Image element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_n9h0gOgfEeO6TvQHODg78w" name="line" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_n9h0gegfEeO6TvQHODg78w">

-          <body>The Line element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_oEA3AOgfEeO6TvQHODg78w" name="marker" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_oEA3AegfEeO6TvQHODg78w">

-          <body>The Marker element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_oJbigOgfEeO6TvQHODg78w" name="path" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_oJbigegfEeO6TvQHODg78w">

-          <body>The Path element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_oO2OAOgfEeO6TvQHODg78w" name="polygon" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_oO2OAegfEeO6TvQHODg78w">

-          <body>The Polygon element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_oXUNgOgfEeO6TvQHODg78w" name="polyline" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_oXUNgegfEeO6TvQHODg78w">

-          <body>The Polyline element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_ofLJAOgfEeO6TvQHODg78w" name="rectangle" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_ofLJAegfEeO6TvQHODg78w">

-          <body>The Rectangle element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_oluc8OgfEeO6TvQHODg78w" name="text" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_oluc8egfEeO6TvQHODg78w">

-          <body>The Text element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-      <ownedLiteral xmi:type="cmof:EnumerationLiteral" xmi:id="_oz2_kOgfEeO6TvQHODg78w" name="use" classifier="#_6aYm0OgeEeO6TvQHODg78w" enumeration="_6aYm0OgeEeO6TvQHODg78w">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="_oz2_kegfEeO6TvQHODg78w">

-          <body>The Use element kind</body>

-        </ownedComment>

-      </ownedLiteral>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_qUuAwM51EeOqlr8E3pzO9g" name="A_definitions_canvas" memberEnd="_jfIkFtesEeOsUY1jE2-lpg _qUuAwc51EeOqlr8E3pzO9g">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_qUuAwc51EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" owningAssociation="_qUuAwM51EeOqlr8E3pzO9g" association="_qUuAwM51EeOqlr8E3pzO9g"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_VJB6MM41EeOqlr8E3pzO9g" name="A_externalStyleSheet_canvas" memberEnd="_jfIkGdesEeOsUY1jE2-lpg _VJB6Mc41EeOqlr8E3pzO9g">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_VJB6Mc41EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" lower="0" upper="*" owningAssociation="_VJB6MM41EeOqlr8E3pzO9g" association="_VJB6MM41EeOqlr8E3pzO9g"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_Nti6EM53EeOqlr8E3pzO9g" name="A_definition_definitions" memberEnd="_zSdxIM5wEeOqlr8E3pzO9g _Nti6Ec53EeOqlr8E3pzO9g">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_Nti6Ec53EeOqlr8E3pzO9g" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" owningAssociation="_Nti6EM53EeOqlr8E3pzO9g" association="_Nti6EM53EeOqlr8E3pzO9g"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_packagedElement.47" name="A_styleSheet_definitions" memberEnd="Canvas-packagedStyle _packagedElement.47-canvas">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_packagedElement.47-canvas" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" owningAssociation="_packagedElement.47" association="_packagedElement.47"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_clipPath_clippedElement" name="A_clipPath_clippedElement" memberEnd="GraphicalElement-clipPath ClipPath-clippedElement">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="ClipPath-clippedElement" name="clippedElement" visibility="public" type="GraphicalElement" lower="0" upper="*" owningAssociation="A_clipPath_clippedElement" association="A_clipPath_clippedElement"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_localStyle_styledElement" name="A_style_styledElement" memberEnd="GraphicalElement-localStyle A_localStyle_styledElement-styledElement">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="A_localStyle_styledElement-styledElement" name="styledElement" visibility="public" type="GraphicalElement" lower="0" owningAssociation="A_localStyle_styledElement" association="A_localStyle_styledElement"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_TVnmYM42EeOqlr8E3pzO9g" name="A_transform_transformedElement" memberEnd="GraphicalElement-transform _TVnmYc42EeOqlr8E3pzO9g">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_TVnmYc42EeOqlr8E3pzO9g" name="transformedElement" visibility="public" type="GraphicalElement" lower="0" owningAssociation="_TVnmYM42EeOqlr8E3pzO9g" association="_TVnmYM42EeOqlr8E3pzO9g"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_hQOVgM41EeOqlr8E3pzO9g" name="A_stop_gradient" memberEnd="Gradient-stop _hQO8kM41EeOqlr8E3pzO9g">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_hQO8kM41EeOqlr8E3pzO9g" name="gradient" visibility="public" type="Gradient" owningAssociation="_hQOVgM41EeOqlr8E3pzO9g" association="_hQOVgM41EeOqlr8E3pzO9g"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_member_group" name="A_member_group" memberEnd="Group-member GraphicalElement-group"/>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_endMarker_markedElement" name="A_endMarker_markedElement" memberEnd="MarkedElement-endMarker A_endMarker_markedElement-markedElement">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="A_endMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" lower="0" upper="*" owningAssociation="A_endMarker_markedElement" association="A_endMarker_markedElement"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_midMarker_markedElement" name="A_midMarker_markedElement" memberEnd="MarkedElement-midMarker A_midMarker_markedElement-markedElement">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="A_midMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" lower="0" upper="*" owningAssociation="A_midMarker_markedElement" association="A_midMarker_markedElement"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_startMarker_markedElement" name="A_startMarker_markedElement" memberEnd="MarkedElement-startMarker A_startMarker_markedElement-markedElement">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="A_startMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" lower="0" upper="*" owningAssociation="A_startMarker_markedElement" association="A_startMarker_markedElement"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_VGk7AM2kEeOtK5GsJlm5Mw" name="A_paintServer_paint" memberEnd="_dR8eIM2dEeOtK5GsJlm5Mw _VGk7Ac2kEeOtK5GsJlm5Mw">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_VGk7Ac2kEeOtK5GsJlm5Mw" name="paint" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" lower="0" upper="*" owningAssociation="_VGk7AM2kEeOtK5GsJlm5Mw" association="_VGk7AM2kEeOtK5GsJlm5Mw"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_oEGFIM55EeOqlr8E3pzO9g" name="A_transform_paintServer" memberEnd="Fill-transform _oEGFIc55EeOqlr8E3pzO9g">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_oEGFIc55EeOqlr8E3pzO9g" name="paintServer" visibility="public" type="Fill" lower="0" owningAssociation="_oEGFIM55EeOqlr8E3pzO9g" association="_oEGFIM55EeOqlr8E3pzO9g"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_-INckM55EeOqlr8E3pzO9g" name="A_command_path" memberEnd="Path-command _-INckc55EeOqlr8E3pzO9g">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_-INckc55EeOqlr8E3pzO9g" name="path" visibility="public" type="Path" owningAssociation="_-INckM55EeOqlr8E3pzO9g" association="_-INckM55EeOqlr8E3pzO9g"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_tile_pattern" name="A_tile_pattern" memberEnd="Pattern-tile A_tile_pattern-pattern">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="A_tile_pattern-pattern" name="pattern" visibility="public" type="Pattern" lower="0" owningAssociation="A_tile_pattern" association="A_tile_pattern"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_fill_style" name="A_fill_style" memberEnd="Style-fill A_fill_style-style">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="A_fill_style-style" name="style" visibility="public" type="Style" lower="0" owningAssociation="A_fill_style" association="A_fill_style"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_KeO_IM2rEeOtK5GsJlm5Mw" name="A_stroke_style" memberEnd="_KemS4M2oEeOtK5GsJlm5Mw _KeO_Ic2rEeOtK5GsJlm5Mw">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_KeO_Ic2rEeOtK5GsJlm5Mw" name="style" visibility="public" type="Style" lower="0" owningAssociation="_KeO_IM2rEeOtK5GsJlm5Mw" association="_KeO_IM2rEeOtK5GsJlm5Mw"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_OTgnYM2GEeOX1ohrWoozJQ" name="A_selector_styleRule" memberEnd="_2CcQMM2FEeOX1ohrWoozJQ _OTgnYc2GEeOX1ohrWoozJQ">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_OTgnYc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" owningAssociation="_OTgnYM2GEeOX1ohrWoozJQ" association="_OTgnYM2GEeOX1ohrWoozJQ"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_vnz5oM2GEeOX1ohrWoozJQ" name="A_style_styleRule" memberEnd="_DFi6IM2GEeOX1ohrWoozJQ _vnz5oc2GEeOX1ohrWoozJQ">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_vnz5oc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" lower="0" owningAssociation="_vnz5oM2GEeOX1ohrWoozJQ" association="_vnz5oM2GEeOX1ohrWoozJQ"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_QZkcUM2DEeOX1ohrWoozJQ" name="A_rule_styleSheet" memberEnd="_TqPtcM2EEeOX1ohrWoozJQ _ZfKSYM2EEeOX1ohrWoozJQ">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_ZfKSYM2EEeOX1ohrWoozJQ" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" owningAssociation="_QZkcUM2DEeOX1ohrWoozJQ" association="_QZkcUM2DEeOX1ohrWoozJQ"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="_zbtccOHnEeO71tdCkM4EDw" name="A_referencedElement_use" memberEnd="_im5DIOHhEeO71tdCkM4EDw _zbtcceHnEeO71tdCkM4EDw">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="_zbtcceHnEeO71tdCkM4EDw" name="use" visibility="public" type="_wGwIsNeoEeOgmPOh7kSfHA" lower="0" upper="*" owningAssociation="_zbtccOHnEeO71tdCkM4EDw" association="_zbtccOHnEeO71tdCkM4EDw"/>

-    </ownedMember>

-    <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-      <profileApplication xmi:type="cmof:ProfileApplication" xmi:id="_mgdyEM1vEeOX1ohrWoozJQ" applyingPackage="_0">

-        <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mgdyEc1vEeOX1ohrWoozJQ" source="http://www.eclipse.org/uml2/2.0.0/UML">

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

-          </eAnnotations>

-        </xmi:Extension>

-        <appliedProfile xmi:type="cmof:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>

-      </profileApplication>

-    </xmi:Extension>

-  </cmof:Package>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_mhwLgM1vEeOX1ohrWoozJQ" base_Package="_0" packageName="dg" nsPrefix="dg" nsURI="http://www.omg.org/spec/DD/20110901/DG" basePackage="org.eclipse.papyrus.dd" prefix="DG"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EReference xmi:id="_f0214M2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fill"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EReference xmi:id="_llTxkM2UEeOtK5GsJlm5Mw" isUnsettable="true"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_rXVakM2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fillOpacity"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_uksHYM2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-strokeWidth"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_xRnnsM2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-strokeOpacity"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EReference xmi:id="_zsCbsM2UEeOtK5GsJlm5Mw" isUnsettable="true"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_3RPAwM2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-strokeDashLength"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_5MnvYM2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fontSize"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_-LD_UM2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fontName"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EReference xmi:id="_JF5VMM2VEeOtK5GsJlm5Mw" isUnsettable="true"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_Lh6rsM2VEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fontItalic"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_NiNIcM2VEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fontBold"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_PKi_QM2VEeOtK5GsJlm5Mw" isUnsettable="true"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_QsHfsM2VEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fontStrikeThrough"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EReference xmi:id="_Kem58M2oEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="_KemS4M2oEeOtK5GsJlm5Mw"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_huN4sNevEeOsUY1jE2-lpg" isUnsettable="true" base_Property="_jfIkE9esEeOsUY1jE2-lpg"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_4NBHoOgvEeO6TvQHODg78w" isUnsettable="true" base_Property="_OsgrUM2IEeOX1ohrWoozJQ"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_Vs_CQOhUEeO6TvQHODg78w" isUnsettable="true" base_Property="GradientStop-offset"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_jGzjEOhUEeO6TvQHODg78w" isUnsettable="true" base_Property="GradientStop-opacity"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="__K6HAOhUEeO6TvQHODg78w" isUnsettable="true" base_Property="GradientStop-color"/>

-  </xmi:Extension>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EAttribute xmi:id="_dpXEIOhuEeO6TvQHODg78w" isUnsettable="true" base_Property="Rectangle-cornerRadius"/>

-  </xmi:Extension>

-  <cmof:Tag xmi:id="_23" name="org.omg.xmi.nsPrefix" value="dg" element="_0"/>

-  <cmof:Tag xmi:id="_24" name="org.omg.xmi.nsURI" value="http://www.omg.org/spec/DD/20110901/DG" element="_0"/>

-</xmi:XMI>

diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.di b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.di
new file mode 100644
index 00000000000..b626db7cf88
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.di
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList>
+    <availablePage>
+      <emfPageIdentifier href="DG.notation#_gCuZEPpSEeO_u4Z14juDDg"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="DG.notation#_upaDsPpUEeO_u4Z14juDDg"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="DG.notation#_WhVIEPpiEeO_u4Z14juDDg"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="DG.notation#_c2KRQPpkEeO_u4Z14juDDg"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="DG.notation#_894FgPptEeO_u4Z14juDDg"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="DG.notation#_rET7kPpwEeO_u4Z14juDDg"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="DG.notation#_BLrl4PpyEeO_u4Z14juDDg"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="DG.notation#_EUZ04PpzEeO_u4Z14juDDg"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="DG.notation#_gCuZEPpSEeO_u4Z14juDDg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="DG.notation#_upaDsPpUEeO_u4Z14juDDg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="DG.notation#_c2KRQPpkEeO_u4Z14juDDg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="DG.notation#_WhVIEPpiEeO_u4Z14juDDg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="DG.notation#_894FgPptEeO_u4Z14juDDg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="DG.notation#_EUZ04PpzEeO_u4Z14juDDg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="DG.notation#_rET7kPpwEeO_u4Z14juDDg"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="DG.notation#_BLrl4PpyEeO_u4Z14juDDg"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore
index c509a728bdf..6dd9995ef00 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.ecore
@@ -47,6 +47,8 @@
         <details key="documentation" value="A list of graphical elements that are members of this group."/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="layout" ordered="false"
+        eType="ecore:EDataType DC.ecore#//String"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GraphicalElement" abstract="true" eSuperTypes="#//Definition">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -101,6 +103,8 @@
         <details key="documentation" value="A list of transforms that apply to this graphical element."/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="layoutData" ordered="false"
+        eType="ecore:EDataType DC.ecore#//String"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Definition" abstract="true">
     <eOperations name="idCannotBeEmpty" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
@@ -1132,6 +1136,8 @@
         <details key="documentation" value="A list of external style sheets that are imported by the canvas."/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="script" ordered="false"
+        upperBound="-1" eType="ecore:EDataType DC.ecore#//String"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Rotate" eSuperTypes="#//Transform">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -1241,6 +1247,13 @@
         <details key="documentation" value="the bounds inside which the text is rendered (possibly wrapped into multiple lines)"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="anchor" ordered="false"
+        eType="#//TextAnchor"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="TextAnchor">
+    <eLiterals name="start"/>
+    <eLiterals name="middle" value="1"/>
+    <eLiterals name="end" value="2"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Translate" eSuperTypes="#//Transform">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel
index 666d22f4621..709d716ee4f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.genmodel
@@ -28,7 +28,7 @@
     <details key="CAMEL_CASE_NAMES" value="PROCESS"/>
     <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
   </genAnnotations>
-  <foreignModel>DG.cmof</foreignModel>
+  <foreignModel>DG.uml</foreignModel>
   <genPackages xsi:type="genmodel:GenPackage" prefix="DG" basePackage="org.eclipse.papyrus.dd"
       disposableProviderFactory="true" ecorePackage="DG.ecore#/">
     <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="DG.ecore#//FontDecoration">
@@ -52,6 +52,11 @@
       <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/text"/>
       <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//ElementKind/use"/>
     </genEnums>
+    <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="DG.ecore#//TextAnchor">
+      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//TextAnchor/start"/>
+      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//TextAnchor/middle"/>
+      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="DG.ecore#//TextAnchor/end"/>
+    </genEnums>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Canvas">
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
           createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Canvas/bounds"/>
@@ -63,6 +68,7 @@
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Group">
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
           createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Group/member"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Group/layout"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="DG.ecore#//GraphicalElement">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
@@ -74,6 +80,7 @@
           createChild="true" ecoreFeature="ecore:EReference DG.ecore#//GraphicalElement/style"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
           createChild="true" ecoreFeature="ecore:EReference DG.ecore#//GraphicalElement/transform"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//GraphicalElement/layoutData"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//GraphicalElement/referencedClippathHasId">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//GraphicalElement/referencedClippathHasId/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//GraphicalElement/referencedClippathHasId/context"/>
@@ -339,6 +346,7 @@
           createChild="true" ecoreFeature="ecore:EReference DG.ecore#//RootCanvas/definitions"/>
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
           propertySortChoices="true" ecoreFeature="ecore:EReference DG.ecore#//RootCanvas/externalStyleSheet"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//RootCanvas/script"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="DG.ecore#//Rotate">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Rotate/angle"/>
@@ -361,6 +369,7 @@
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Text/data"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
           createChild="true" ecoreFeature="ecore:EReference DG.ecore#//Text/position"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DG.ecore#//Text/anchor"/>
       <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="DG.ecore#//Text/dataCannotBeEmpty">
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Text/dataCannotBeEmpty/diagnostics"/>
         <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="DG.ecore#//Text/dataCannotBeEmpty/context"/>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.notation b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.notation
new file mode 100644
index 00000000000..dd38dadd87f
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.notation
@@ -0,0 +1,3415 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+  <notation:Diagram xmi:id="_gCuZEPpSEeO_u4Z14juDDg" type="PapyrusUMLClassDiagram" name="Graphical Element" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_5o0CcPpSEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5o0pgPpSEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5o0pgfpSEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5o0pgvpSEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5o0pg_pSEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5o0phPpSEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5o1QkPpSEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5o1QkfpSEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5o1QkvpSEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_UMIwIPpTEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_yyXeMM2TEeOtK5GsJlm5Mw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_UMIwIfpTEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_V0IyoBMTEeSVwtSTQ1YVCg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_V0HkgBMTEeSVwtSTQ1YVCg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_V0IyoRMTEeSVwtSTQ1YVCg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5o1Qk_pSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5o1QlPpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5o1QlfpSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5o1QlvpSEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5o1Ql_pSEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5o1QmPpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5o1QmfpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5o1QmvpSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5o1Qm_pSEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5o1QnPpSEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5o1QnfpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5o1QnvpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5o1Qn_pSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5o1QoPpSEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5o7-QPpSEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5o7-QfpSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5o7-QvpSEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#GraphicalElement"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5o0CcfpSEeO_u4Z14juDDg" x="293" y="121" width="168" height="80"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-mdoMPpSEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-mePQPpSEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-mePQfpSEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-mePQvpSEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-mePQ_pSEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-mePRPpSEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-mePRfpSEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-mePRvpSEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-mePR_pSEeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-mePSPpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-mePSfpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-mePSvpSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-mePS_pSEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-mePTPpSEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-mePTfpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-mePTvpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-mePT_pSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-mePUPpSEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-mePUfpSEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-mePUvpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-mePU_pSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-mePVPpSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-mePVfpSEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-mkV4PpSEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-mkV4fpSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-mkV4vpSEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#ClipPath"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-mdoMfpSEeO_u4Z14juDDg" x="20" y="121" height="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-mxKMPpSEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-mxxQPpSEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-mxxQfpSEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-mxxQvpSEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-mxxQ_pSEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-mxxRPpSEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-mxxRfpSEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-mxxRvpSEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-mxxR_pSEeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-mxxSPpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-mxxSfpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-mxxSvpSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-mxxS_pSEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-mxxTPpSEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-mxxTfpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-mxxTvpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-mxxT_pSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-mxxUPpSEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-myYUPpSEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-myYUfpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-myYUvpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-myYU_pSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-myYVPpSEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-m334PpSEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-m334fpSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-m334vpSEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Style"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-mxKMfpSEeO_u4Z14juDDg" x="320" y="280" width="120" height="42"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-nGhYPpSEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-nGhYvpSEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-nGhY_pSEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-nHIcPpSEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-nHIcfpSEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-nHIcvpSEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-nHIc_pSEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-nHIdPpSEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-nHIdfpSEeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-nHIdvpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-nHId_pSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-nHIePpSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-nHIefpSEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-nHIevpSEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-nHIe_pSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-nHIfPpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-nHIffpSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-nHIfvpSEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-nHIf_pSEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-nHIgPpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-nHIgfpSEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-nHIgvpSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-nHIg_pSEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-nMoAPpSEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-nMoAfpSEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-nMoAvpSEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Transform"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-nGhYfpSEeO_u4Z14juDDg" x="700" y="118" height="42"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_RzFFsPphEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RzFswPphEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RzFswfphEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RzFswvphEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RzFsw_phEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RzFsxPphEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RzFsxfphEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_RzFsxvphEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_RzFsx_phEeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_RzFsyPphEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_RzFsyfphEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_RzFsyvphEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RzFsy_phEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_RzFszPphEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_RzFszfphEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_RzFszvphEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_RzFsz_phEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RzFs0PphEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_RzFs0fphEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_RzFs0vphEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_RzFs0_phEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_RzFs1PphEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RzFs1fphEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_RzLzYPphEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_RzLzYfphEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RzLzYvphEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_CwockM6jEeOqlr8E3pzO9g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RzFFsfphEeO_u4Z14juDDg" x="320" y="40" width="121" height="40"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_gCuZEfpSEeO_u4Z14juDDg"/>
+    <element xmi:type="uml:Package" href="DG.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_-mnZMPpSEeO_u4Z14juDDg" type="4001" source="_-mdoMPpSEeO_u4Z14juDDg" target="_5o0CcPpSEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-moAQPpSEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-moAQfpSEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-moAQvpSEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-moAQ_pSEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-moARPpSEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-moARfpSEeO_u4Z14juDDg" x="23" y="-14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-moARvpSEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-moAR_pSEeO_u4Z14juDDg" x="-31" y="10"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-monUPpSEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-monUfpSEeO_u4Z14juDDg" x="11" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-monUvpSEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-monU_pSEeO_u4Z14juDDg" x="3" y="-14"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_-mnZMfpSEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#A_clipPath_clippedElement"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-mnZMvpSEeO_u4Z14juDDg" points="[48, -21, -205, 19]$[221, -21, -32, 19]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__rcTQPpSEeO_u4Z14juDDg" id="(0.52,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__rcTQfpSEeO_u4Z14juDDg" id="(0.25,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_-m8JUPpSEeO_u4Z14juDDg" type="4001" source="_-mxKMPpSEeO_u4Z14juDDg" target="_5o0CcPpSEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-m8wYPpSEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-m8wYfpSEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-m8wYvpSEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-m8wY_pSEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-m9XcPpSEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-m9XcfpSEeO_u4Z14juDDg" x="2" y="-40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-m9XcvpSEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-m9Xc_pSEeO_u4Z14juDDg" x="-13" y="58"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-m9XdPpSEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-m9XdfpSEeO_u4Z14juDDg" x="6" y="37"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-m9XdvpSEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-m9Xd_pSEeO_u4Z14juDDg" x="-13" y="-23"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_-m8JUfpSEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#A_localStyle_styledElement"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-m8JUvpSEeO_u4Z14juDDg" points="[0, -42, 3, 159]$[0, -121, 3, 80]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__rc6UPpSEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__rdhYPpSEeO_u4Z14juDDg" id="(0.5,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_-nPrUPpSEeO_u4Z14juDDg" type="4001" source="_-nGhYPpSEeO_u4Z14juDDg" target="_5o0CcPpSEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-nPrU_pSEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-nPrVPpSEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-nQSYPpSEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-nQSYfpSEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-nQSYvpSEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-nQSY_pSEeO_u4Z14juDDg" x="33" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-nQSZPpSEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-nQSZfpSEeO_u4Z14juDDg" x="-34" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-nQSZvpSEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-nQSZ_pSEeO_u4Z14juDDg" x="17" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-nQSaPpSEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-nQSafpSEeO_u4Z14juDDg" x="-9" y="-6"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_-nPrUfpSEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_TVnmYM42EeOqlr8E3pzO9g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-nPrUvpSEeO_u4Z14juDDg" points="[-49, -20, 266, 19]$[-268, -20, 47, 19]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__reIcPpSEeO_u4Z14juDDg" id="(0.49,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__reIcfpSEeO_u4Z14juDDg" id="(0.75,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_RzO2sPphEeO_u4Z14juDDg" type="4002" source="_5o0CcPpSEeO_u4Z14juDDg" target="_RzFFsPphEeO_u4Z14juDDg" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_RzPdwPphEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_RzPdwfphEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_RzO2sfphEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcKPo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RzO2svphEeO_u4Z14juDDg" points="[-64, -27, 293, 123]$[-357, -150, 0, 0]"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_upaDsPpUEeO_u4Z14juDDg" type="PapyrusUMLClassDiagram" name="Primitive Elements" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_qUfccPpVEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qUgDgPpVEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qUgDgfpVEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qUgDgvpVEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qUgDg_pVEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qUgDhPpVEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qUgDhfpVEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qUgDhvpVEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qUgDh_pVEeO_u4Z14juDDg" visible="false" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_vFLOIPpeEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_yyXeMM2TEeOtK5GsJlm5Mw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vFLOIfpeEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qUgDiPpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qUgDifpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qUgDivpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qUgDi_pVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qUgqkPpVEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qUgqkfpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qUgqkvpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qUgqk_pVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qUgqlPpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qUgqlfpVEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qUgqlvpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qUgql_pVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qUgqmPpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qUgqmfpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qUnYQPpVEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qUnYQfpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qUnYQvpVEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#GraphicalElement"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qUfccfpVEeO_u4Z14juDDg" x="328" y="20" width="132" height="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_x5PnUPpVEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_x5QOYPpVEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_x5QOYfpVEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_x5QOYvpVEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_x5QOY_pVEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_x5QOZPpVEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_x5QOZfpVEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_x5Q1cPpVEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_x5Q1cfpVEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_jgyhwPpaEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Circle-center"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_jgyhwfpaEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_jgzI0PpaEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Circle-radius"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_jgzI0fpaEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_x5Q1cvpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_x5Q1c_pVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_x5Q1dPpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x5Q1dfpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_x5Q1dvpVEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_x5Q1d_pVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_x5Q1ePpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_x5Q1efpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x5Q1evpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_x5Q1e_pVEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_x5Q1fPpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_x5Q1ffpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_x5Q1fvpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x5Q1f_pVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_x5XjIPpVEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_x5XjIfpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x5XjIvpVEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Circle"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_x5PnUfpVEeO_u4Z14juDDg" x="509" y="100" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_027gcPpVEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_028HgPpVEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_028HgfpVEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_028HgvpVEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_028Hg_pVEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_028HhPpVEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_028HhfpVEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_028HhvpVEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_028Hh_pVEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_nvJYkPpaEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Ellipse-center"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_nvJYkfpaEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_nvJ_oPpaEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Ellipse-radii"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_nvJ_ofpaEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_028HiPpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_028HifpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_028HivpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_028Hi_pVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_028HjPpVEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_028HjfpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_028HjvpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_028Hj_pVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_028HkPpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_028ukPpVEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_028ukfpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_028ukvpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_028uk_pVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_028ulPpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_03COIPpVEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_03COIfpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_03COIvpVEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Ellipse"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_027gcfpVEeO_u4Z14juDDg" x="256" y="99" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_4LGm8PpVEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4LHOAPpVEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4LHOAfpVEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4LHOAvpVEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4LHOA_pVEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4LHOBPpVEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4LHOBfpVEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_4LHOBvpVEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4LH1EPpVEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_vJGosPpaEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Image-source"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vJGosfpaEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_vJGosvpaEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Image-bounds"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vJGos_paEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_vJHPwPpaEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Image-isAspectRatioPreserved"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_vJHPwfpaEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4LH1EfpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_4LH1EvpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4LH1E_pVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LH1FPpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4LH1FfpVEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4LH1FvpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_4LH1F_pVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4LH1GPpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LH1GfpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4LH1GvpVEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4LH1G_pVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_4LH1HPpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_4LH1HfpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LH1HvpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_4LOiwPpVEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_4LOiwfpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LOiwvpVEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Image"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4LGm8fpVEeO_u4Z14juDDg" x="4" y="260" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_6RIfUPpVEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6RIfUvpVEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6RJGYPpVEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6RJGYfpVEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6RJGYvpVEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6RJGY_pVEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6RJGZPpVEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6RJGZfpVEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6RJGZvpVEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_ExClAPpcEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Line-start"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ExClAfpcEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_ExClAvpcEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Line-end"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ExClA_pcEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6RJGZ_pVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6RJGaPpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6RJGafpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6RJGavpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6RJGa_pVEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6RJGbPpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6RJGbfpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6RJGbvpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6RJGb_pVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6RJGcPpVEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6RJGcfpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6RJGcvpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6RJGc_pVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6RJGdPpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6RPNAPpVEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6RPNAfpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6RPNAvpVEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Line"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6RIfUfpVEeO_u4Z14juDDg" x="660" y="338" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_6RS3YPpVEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6RS3YvpVEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6RS3Y_pVEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6RS3ZPpVEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6RS3ZfpVEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_6RS3ZvpVEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_6RTecPpVEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_6RTecfpVEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6RTecvpVEeO_u4Z14juDDg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6RTec_pVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6RTedPpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6RTedfpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6RTedvpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6RTed_pVEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6RTeePpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6RTeefpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6RTeevpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6RTee_pVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6RTefPpVEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6RTeffpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_6RTefvpVEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_6RTef_pVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6RTegPpVEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_6RY-APpVEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_6RY-AfpVEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6RY-AvpVEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#MarkedElement"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6RS3YfpVEeO_u4Z14juDDg" x="380" y="180" height="121"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_MPVxUPpWEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MPWYYPpWEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MPWYYfpWEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MPWYYvpWEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MPWYY_pWEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_MPWYZPpWEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_MPWYZfpWEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_MPWYZvpWEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MPWYZ_pWEeO_u4Z14juDDg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MPWYaPpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_MPWYafpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_MPWYavpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MPWYa_pWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MPW_cPpWEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MPW_cfpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_MPW_cvpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_MPW_c_pWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MPW_dPpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MPW_dfpWEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MPW_dvpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_MPW_d_pWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_MPW_ePpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MPW_efpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_MPdGEPpWEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_MPdGEfpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MPdGEvpWEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Path"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_MPVxUfpWEeO_u4Z14juDDg" x="260" y="339" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_OCoT4PpWEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OCo68PpWEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCo68fpWEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OCo68vpWEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCo68_pWEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OCo69PpWEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OCo69fpWEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_OCo69vpWEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_OCo69_pWEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_PHolYPpcEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Polygon-point"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_PHolYfpcEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_OCo6-PpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_OCo6-fpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_OCo6-vpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OCo6-_pWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_OCo6_PpWEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_OCo6_fpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_OCo6_vpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_OCo6__pWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OCo7APpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_OCo7AfpWEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_OCo7AvpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_OCo7A_pWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_OCo7BPpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OCo7BfpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_OCvBkPpWEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_OCvBkfpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OCvBkvpWEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Polygon"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OCoT4fpWEeO_u4Z14juDDg" x="382" y="338" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_O7vtMPpWEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O7wUQPpWEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O7wUQfpWEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O7wUQvpWEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O7wUQ_pWEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_O7wURPpWEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_O7wURfpWEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_O7wURvpWEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_O7w7UPpWEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_Qv7_8PpcEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Polyline-point"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_Qv7_8fpcEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_O7w7UfpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_O7w7UvpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_O7w7U_pWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O7w7VPpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_O7w7VfpWEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_O7w7VvpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_O7w7V_pWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_O7w7WPpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O7w7WfpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_O7w7WvpWEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_O7w7W_pWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_O7w7XPpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_O7w7XfpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O7w7XvpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_O73B8PpWEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_O73B8fpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O73B8vpWEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Polyline"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O7vtMfpWEeO_u4Z14juDDg" x="522" y="338" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_QZy_kPpWEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QZy_kvpWEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QZzmoPpWEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QZzmofpWEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QZzmovpWEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QZzmo_pWEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QZzmpPpWEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QZzmpfpWEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QZzmpvpWEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_1TMMYPpaEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Rectangle-bounds"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_1TMMYfpaEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_1TMMYvpaEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Rectangle-cornerRadius"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_1TMMY_paEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QZzmp_pWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QZzmqPpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QZzmqfpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZzmqvpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QZzmq_pWEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QZzmrPpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QZzmrfpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QZzmrvpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZzmr_pWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QZzmsPpWEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QZzmsfpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QZzmsvpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QZzms_pWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZzmtPpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QZ6UUPpWEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QZ6UUfpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZ6UUvpWEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Rectangle"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QZy_kfpWEeO_u4Z14juDDg" y="180" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_TqvL4PpWEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Tqvy8PpWEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Tqvy8fpWEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Tqvy8vpWEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Tqvy8_pWEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Tqvy9PpWEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Tqvy9fpWEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Tqvy9vpWEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Tqvy9_pWEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_3QJoUPpaEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Text-data"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_3QJoUfpaEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_3QKPYPpaEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Text-bounds"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_3QKPYfpaEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_gfv7IBOfEeSXerk-XJQMGw" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_gfifwBOfEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_gfv7IROfEeSXerk-XJQMGw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Tqvy-PpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Tqvy-fpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Tqvy-vpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tqvy-_pWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Tqvy_PpWEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Tqvy_fpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Tqvy_vpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Tqvy__pWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TqvzAPpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TqwaAPpWEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TqwaAfpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_TqwaAvpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_TqwaA_pWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TqwaBPpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Tq15kPpWEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Tq15kfpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Tq15kvpWEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Text"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TqvL4fpWEeO_u4Z14juDDg" x="200" y="180" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Vy2H4PpWEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vy2H4vpWEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vy2u8PpWEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vy2u8fpWEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vy2u8vpWEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Vy2u8_pWEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Vy2u9PpWEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Vy2u9fpWEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Vy2u9vpWEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_6W1scPpaEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_wGwIs9eoEeOgmPOh7kSfHA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_6W1scfpaEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Vy2u9_pWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Vy2u-PpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Vy2u-fpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vy2u-vpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Vy2u-_pWEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Vy2u_PpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Vy2u_fpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Vy2u_vpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vy2u__pWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Vy2vAPpWEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Vy2vAfpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Vy2vAvpWEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Vy2vA_pWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vy2vBPpWEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Vy9coPpWEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Vy9cofpWEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vy9covpWEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_wGwIsNeoEeOgmPOh7kSfHA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Vy2H4fpWEeO_u4Z14juDDg" x="-4" y="99" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_IRucgPpnEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IRvDkPpnEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IRvDkfpnEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IRvDkvpnEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IRvDk_pnEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IRvDlPpnEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IRvDlfpnEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IRvDlvpnEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IRvDl_pnEeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IRvDmPpnEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IRvDmfpnEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IRvDmvpnEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IRvDm_pnEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IRvDnPpnEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IRvDnfpnEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IRvDnvpnEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IRvDn_pnEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IRvDoPpnEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IRvqoPpnEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IRvqofpnEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IRvqovpnEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IRvqo_pnEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IRvqpPpnEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IR0jIPpnEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IR0jIfpnEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IR0jIvpnEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Marker"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IRucgfpnEeO_u4Z14juDDg" x="660" y="178" height="122"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_5jetIPprEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5jfUMPprEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jfUMfprEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5jfUMvprEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jfUM_prEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_5jfUNPprEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_5jf7QPprEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5jf7QfprEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5jf7QvprEeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5jf7Q_prEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5jf7RPprEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5jf7RfprEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5jf7RvprEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5jf7R_prEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5jf7SPprEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5jf7SfprEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5jf7SvprEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5jf7S_prEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5jf7TPprEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5jf7TfprEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_5jf7TvprEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_5jf7T_prEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5jf7UPprEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_5jmB4PprEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_5jmB4fprEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5jmB4vprEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#PathCommand"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_5jetIfprEeO_u4Z14juDDg" y="340" height="46"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_E7tXUBOfEeSXerk-XJQMGw" type="2006" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E7vMgBOfEeSXerk-XJQMGw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_E7vMgROfEeSXerk-XJQMGw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E7vzkBOfEeSXerk-XJQMGw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_E7vzkROfEeSXerk-XJQMGw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_E7vzkhOfEeSXerk-XJQMGw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_E7vzkxOfEeSXerk-XJQMGw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_E7vzlBOfEeSXerk-XJQMGw" type="5023"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_E7vzlROfEeSXerk-XJQMGw" type="7015">
+        <children xmi:type="notation:Shape" xmi:id="_GonlEBOfEeSXerk-XJQMGw" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_Gog3YBOfEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_GonlEROfEeSXerk-XJQMGw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_NUqmUBOfEeSXerk-XJQMGw" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_NUm78BOfEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_NUqmUROfEeSXerk-XJQMGw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_OAApYBOfEeSXerk-XJQMGw" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_N_-0MBOfEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_OAApYROfEeSXerk-XJQMGw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_E7vzlhOfEeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_E7vzlxOfEeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_E7vzmBOfEeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7vzmROfEeSXerk-XJQMGw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_E8Fx0BOfEeSXerk-XJQMGw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_E8Fx0ROfEeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E8Fx0hOfEeSXerk-XJQMGw"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="DG.uml#_E6CjYBOfEeSXerk-XJQMGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7tXUROfEeSXerk-XJQMGw" x="660" y="60"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_upaDsfpUEeO_u4Z14juDDg"/>
+    <element xmi:type="uml:Package" href="DG.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_x5bNgPpVEeO_u4Z14juDDg" type="4002" source="_x5PnUPpVEeO_u4Z14juDDg" target="_qUfccPpVEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_x5b0kPpVEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_x5b0kfpVEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_x5bNgfpVEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcIfo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_x5bNgvpVEeO_u4Z14juDDg" points="[0, -61, 222, 80]$[0, -81, 222, 60]$[-144, -81, 78, 60]$[-144, -101, 78, 40]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYpOUfpWEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYpOUvpWEeO_u4Z14juDDg" id="(0.10714285714285714,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_03F4gPpVEeO_u4Z14juDDg" type="4002" source="_027gcPpVEeO_u4Z14juDDg" target="_qUfccPpVEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_03F4g_pVEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_03GfkPpVEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_03F4gfpVEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcJfo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_03F4gvpVEeO_u4Z14juDDg" points="[0, -61, -34, 79]$[0, -80, -34, 60]$[98, -80, 64, 60]$[98, -100, 64, 40]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYmLAPpWEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYmLAfpWEeO_u4Z14juDDg" id="(0.21428571428571427,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_4LS0MPpVEeO_u4Z14juDDg" type="4002" source="_4LGm8PpVEeO_u4Z14juDDg" target="_qUfccPpVEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_4LS0M_pVEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_4LTbQPpVEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_4LS0MfpVEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcKvo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4LS0MvpVEeO_u4Z14juDDg" points="[68, -61, -205, 240]$[68, -241, -205, 60]$[308, -241, 35, 60]$[308, -261, 35, 40]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYqccvpWEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYrDgPpWEeO_u4Z14juDDg" id="(0.4375,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_6RcoYPpVEeO_u4Z14juDDg" type="4002" source="_6RIfUPpVEeO_u4Z14juDDg" target="_6RS3YPpVEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_6RdPcPpVEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6RdPcfpVEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_6RcoYfpVEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcK_o2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6RcoYvpVEeO_u4Z14juDDg" points="[0, -61, 331, 158]$[0, -79, 331, 140]$[-301, -79, 30, 140]$[-301, -98, 30, 121]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYrDgfpWEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYrDgvpWEeO_u4Z14juDDg" id="(0.2,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_MPgwcPpWEeO_u4Z14juDDg" type="4002" source="_MPVxUPpWEeO_u4Z14juDDg" target="_6RS3YPpVEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_MPhXgPpWEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_MPhXgfpWEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_MPgwcfpWEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcM_o2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_MPgwcvpWEeO_u4Z14juDDg" points="[10, -61, -80, 159]$[10, -80, -80, 140]$[100, -80, 10, 140]$[100, -99, 10, 121]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYrqkPpWEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYrqkfpWEeO_u4Z14juDDg" id="(0.4,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_OCyr8PpWEeO_u4Z14juDDg" type="4002" source="_OCoT4PpWEeO_u4Z14juDDg" target="_6RS3YPpVEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_OCzTAPpWEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OCzTAfpWEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_OCyr8fpWEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcNfo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OCyr8vpWEeO_u4Z14juDDg" points="[0, -61, 21, 158]$[0, -79, 21, 140]$[-31, -79, -10, 140]$[-31, -98, -10, 121]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYqccPpWEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYqccfpWEeO_u4Z14juDDg" id="(0.6,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_O76sUPpWEeO_u4Z14juDDg" type="4002" source="_O7vtMPpWEeO_u4Z14juDDg" target="_6RS3YPpVEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_O77TYPpWEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_O77TYfpWEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_O76sUfpWEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcNvo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_O76sUvpWEeO_u4Z14juDDg" points="[39, -61, 180, 158]$[39, -79, 180, 140]$[-171, -79, -30, 140]$[-171, -98, -30, 121]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYrqkvpWEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYsRoPpWEeO_u4Z14juDDg" id="(0.8,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_QZ9-sPpWEeO_u4Z14juDDg" type="4002" source="_QZy_kPpWEeO_u4Z14juDDg" target="_qUfccPpVEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_QZ-lwPpWEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_QZ-lwfpWEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_QZ9-sfpWEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PiDMfo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QZ9-svpWEeO_u4Z14juDDg" points="[59, -61, -244, 160]$[59, -161, -244, 60]$[322, -161, 19, 60]$[322, -181, 19, 40]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYoAMfpWEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYoAMvpWEeO_u4Z14juDDg" id="(0.5535714285714286,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Tq5j8PpWEeO_u4Z14juDDg" type="4002" source="_TqvL4PpWEeO_u4Z14juDDg" target="_qUfccPpVEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Tq6LAPpWEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Tq6LAfpWEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Tq5j8fpWEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PiDNvo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Tq5j8vpWEeO_u4Z14juDDg" points="[-40, -61, -175, 160]$[-40, -161, -175, 60]$[140, -161, 5, 60]$[140, -181, 5, 40]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYmyEPpWEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYmyEfpWEeO_u4Z14juDDg" id="(0.6607142857142857,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_VzBHAPpWEeO_u4Z14juDDg" type="4002" source="_Vy2H4PpWEeO_u4Z14juDDg" target="_qUfccPpVEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_VzBuEPpWEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_VzBuEfpWEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_VzBHAfpWEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PiDOPo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_VzBHAvpWEeO_u4Z14juDDg" points="[28, -61, -334, 79]$[28, -80, -334, 60]$[352, -80, -10, 60]$[352, -100, -10, 40]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYnZIPpWEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aYnZIfpWEeO_u4Z14juDDg" id="(0.7767857142857143,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__84rwPpWEeO_u4Z14juDDg" type="4002" source="_6RS3YPpVEeO_u4Z14juDDg" target="_qUfccPpVEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="__84rw_pWEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__84rxPpWEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__84rwfpWEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcLvo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__84rwvpWEeO_u4Z14juDDg" points="[-10, -121, -24, 160]$[-10, -241, -24, 40]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ax-gsPpXEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Ax_HwPpXEeO_u4Z14juDDg" id="(0.8839285714285714,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_1kL0wPplEeO_u4Z14juDDg" type="4001" source="_qUfccPpVEeO_u4Z14juDDg" target="_Vy2H4PpWEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_1kMb0PplEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1kMb0fplEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1kMb0vplEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1kMb0_plEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1kMb1PplEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1kMb1fplEeO_u4Z14juDDg" x="35" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1kMb1vplEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1kNC4PplEeO_u4Z14juDDg" x="41" y="23"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1kNC4fplEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1kNC4vplEeO_u4Z14juDDg" x="2" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_1kNC4_plEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_1kNC5PplEeO_u4Z14juDDg" x="41" y="-10"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_1kL0wfplEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_zbtccOHnEeO71tdCkM4EDw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1kL0wvplEeO_u4Z14juDDg" points="[-66, 0, 280, -89]$[-356, 0, -10, -89]$[-356, 59, -10, -30]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_IR4NgPpnEeO_u4Z14juDDg" type="4001" source="_IRucgPpnEeO_u4Z14juDDg" target="_6RS3YPpVEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_IR4Ng_pnEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IR4NhPpnEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IR4NhfpnEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IR4NhvpnEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IR40kPpnEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IR40kfpnEeO_u4Z14juDDg" x="40" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IR40kvpnEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IR40k_pnEeO_u4Z14juDDg" x="-25" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IR40lPpnEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IR40lfpnEeO_u4Z14juDDg" x="19" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_IR40lvpnEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_IR40l_pnEeO_u4Z14juDDg" x="14" y="-6"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_IR4NgfpnEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#A_endMarker_markedElement"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IR4NgvpnEeO_u4Z14juDDg" points="[-50, -39, 230, -40]$[-230, -39, 50, -40]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_JKNjsPpnEeO_u4Z14juDDg" type="4001" source="_IRucgPpnEeO_u4Z14juDDg" target="_6RS3YPpVEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_JKOKwPpnEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JKOKwfpnEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JKOKwvpnEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JKOKw_pnEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JKOKxPpnEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JKOKxfpnEeO_u4Z14juDDg" x="36" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JKOKxvpnEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JKOKx_pnEeO_u4Z14juDDg" x="-22" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JKOKyPpnEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JKOKyfpnEeO_u4Z14juDDg" x="16" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JKOx0PpnEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JKOx0fpnEeO_u4Z14juDDg" x="17" y="-6"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_JKNjsfpnEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#A_midMarker_markedElement"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JKNjsvpnEeO_u4Z14juDDg" points="[-50, 1, 230, 0]$[-230, 1, 50, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_JKX7wPpnEeO_u4Z14juDDg" type="4001" source="_IRucgPpnEeO_u4Z14juDDg" target="_6RS3YPpVEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_JKYi0PpnEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JKYi0fpnEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JKYi0vpnEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JKYi0_pnEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JKYi1PpnEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JKYi1fpnEeO_u4Z14juDDg" x="34" y="-11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JKYi1vpnEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JKYi1_pnEeO_u4Z14juDDg" x="-22" y="8"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JKYi2PpnEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JKYi2fpnEeO_u4Z14juDDg" x="19" y="9"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_JKYi2vpnEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JKZJ4PpnEeO_u4Z14juDDg" x="14" y="-11"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_JKX7wfpnEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#A_startMarker_markedElement"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JKX7wvpnEeO_u4Z14juDDg" points="[-50, 41, 230, 30]$[-230, 41, 50, 30]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_5jpFMPprEeO_u4Z14juDDg" type="4001" source="_5jetIPprEeO_u4Z14juDDg" target="_MPVxUPpWEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_5jpsQPprEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5jpsQfprEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5jpsQvprEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5jpsQ_prEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5jpsRPprEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5jpsRfprEeO_u4Z14juDDg" x="30" y="-12"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5jpsRvprEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5jpsR_prEeO_u4Z14juDDg" x="-16" y="8"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5jpsSPprEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5jpsSfprEeO_u4Z14juDDg" x="13" y="8"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_5jpsSvprEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_5jpsS_prEeO_u4Z14juDDg" x="-5" y="-12"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_5jpFMfprEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_-INckM55EeOqlr8E3pzO9g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_5jpFMvprEeO_u4Z14juDDg" points="[50, -3, -210, -9]$[210, -3, -50, -9]"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_WhVIEPpiEeO_u4Z14juDDg" type="PapyrusUMLClassDiagram" name="Definitions" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_Y69R4PpiEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y6948PpiEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y6948fpiEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y6948vpiEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y6948_piEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y6949PpiEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y6949fpiEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Y6949vpiEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Y6949_piEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_bhU3MPpiEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_3JUlwM6jEeOqlr8E3pzO9g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_bhU3MfpiEeO_u4Z14juDDg" x="13" y="15"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Y694-PpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Y694-fpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Y694-vpiEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y694-_piEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Y694_PpiEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Y694_fpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Y694_vpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Y694__piEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y695APpiEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Y6-gAPpiEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Y6-gAfpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Y6-gAvpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Y6-gA_piEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y6-gBPpiEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Y7D_kPpiEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Y7D_kfpiEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y7D_kvpiEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_CwockM6jEeOqlr8E3pzO9g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y69R4fpiEeO_u4Z14juDDg" x="14" y="20" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Y7Gb0PpiEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y7Gb0vpiEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y7Gb0_piEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y7HC4PpiEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y7HC4fpiEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Y7HC4vpiEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Y7HC4_piEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Y7HC5PpiEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Y7HC5fpiEeO_u4Z14juDDg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Y7HC5vpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Y7HC5_piEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Y7HC6PpiEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y7HC6fpiEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Y7HC6vpiEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Y7HC6_piEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Y7HC7PpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Y7HC7fpiEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y7HC7vpiEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Y7HC7_piEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Y7HC8PpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Y7HC8fpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Y7HC8vpiEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y7HC8_piEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Y7MicPpiEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Y7MicfpiEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y7MicvpiEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_DH0DwM5yEeOqlr8E3pzO9g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Y7Gb0fpiEeO_u4Z14juDDg" x="340" y="20" height="121"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_f9rGsPpiEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f9rtwPpiEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f9rtwfpiEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f9rtwvpiEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f9rtw_piEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_f9rtxPpiEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_f9rtxfpiEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_f9rtxvpiEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_f9rtx_piEeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_f9rtyPpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_f9rtyfpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_f9rtyvpiEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f9rty_piEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_f9rtzPpiEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_f9rtzfpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_f9rtzvpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_f9rtz_piEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f9rt0PpiEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_f9sU0PpiEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_f9sU0fpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_f9sU0vpiEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_f9sU0_piEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f9sU1PpiEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_f9ybcPpiEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_f9ybcfpiEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f9ybcvpiEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_4ytfwM2CEeOX1ohrWoozJQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_f9rGsfpiEeO_u4Z14juDDg" x="20" y="100" height="41"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_WhVIEfpiEeO_u4Z14juDDg"/>
+    <element xmi:type="uml:Package" href="DG.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_kBvZEPpiEeO_u4Z14juDDg" type="4001" source="_Y69R4PpiEeO_u4Z14juDDg" target="_Y7Gb0PpiEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_kBwAIPpiEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kBwAIfpiEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kBwAIvpiEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kBwAI_piEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kBwAJPpiEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kBwnMPpiEeO_u4Z14juDDg" x="25" y="-14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kBwnMfpiEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kBwnMvpiEeO_u4Z14juDDg" x="-37" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kBwnM_piEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kBwnNPpiEeO_u4Z14juDDg" x="3" y="11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kBwnNfpiEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kBwnNvpiEeO_u4Z14juDDg" x="-22" y="-14"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_kBvZEfpiEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_Nti6EM53EeOqlr8E3pzO9g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kBvZEvpiEeO_u4Z14juDDg" points="[53, -10, -230, -40]$[233, -10, -50, -40]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_kB6YMPpiEeO_u4Z14juDDg" type="4001" source="_f9rGsPpiEeO_u4Z14juDDg" target="_Y7Gb0PpiEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_kB6_QPpiEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kB6_QfpiEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kB6_QvpiEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kB6_Q_piEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kB6_RPpiEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kB6_RfpiEeO_u4Z14juDDg" x="28" y="-9"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kB6_RvpiEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kB6_R_piEeO_u4Z14juDDg" x="-31" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kB6_SPpiEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kB6_SfpiEeO_u4Z14juDDg" x="10" y="11"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_kB6_SvpiEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_kB7mUPpiEeO_u4Z14juDDg" x="-16" y="-14"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_kB6YMfpiEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_packagedElement.47"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_kB6YMvpiEeO_u4Z14juDDg" points="[50, 0, -230, 40]$[230, 0, -50, 40]"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_c2KRQPpkEeO_u4Z14juDDg" type="PapyrusUMLClassDiagram" name="Group Elements" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_efkfEPpkEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efkfEfpkEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efkfEvpkEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efkfE_pkEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efkfFPpkEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efkfFfpkEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efkfFvpkEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_efkfF_pkEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efkfGPpkEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_efkfGfpkEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_jfIkE9esEeOsUY1jE2-lpg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_efkfGvpkEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_V5Ih0A35EeSM9dpvq2CG1g" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_V49isA35EeSM9dpvq2CG1g"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_V5Ih0Q35EeSM9dpvq2CG1g"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efkfG_pkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efkfHPpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efkfHfpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efkfHvpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efkfH_pkEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efkfIPpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efkfIfpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efkfIvpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efkfI_pkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efkfJPpkEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efkfJfpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efkfJvpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efkfJ_pkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efkfKPpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efkfKfpkEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efkfKvpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efkfK_pkEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_jfIkENesEeOsUY1jE2-lpg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efkfLPpkEeO_u4Z14juDDg" x="273" y="300" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_eflGRvpkEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eflGR_pkEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eflGSPpkEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eflGSfpkEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eflGSvpkEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eflGS_pkEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eflGTPpkEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_eflGTfpkEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eflGTvpkEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_wULYQBMSEeSVwtSTQ1YVCg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_wT0y8BMSEeSVwtSTQ1YVCg"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_wULYQRMSEeSVwtSTQ1YVCg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eflGT_pkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_eflGUPpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_eflGUfpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eflGUvpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eflGU_pkEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eflGVPpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_eflGVfpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_eflGVvpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eflGV_pkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eflGWPpkEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eflGWfpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_eflGWvpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_eflGW_pkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eflGXPpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_eflGXfpkEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_eflGXvpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eflGX_pkEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Group"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eflGYPpkEeO_u4Z14juDDg" x="300" y="80" width="161" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_efltMPpkEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efltMfpkEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efltMvpkEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efltM_pkEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efltNPpkEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efltNfpkEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efltNvpkEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_efltN_pkEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efltOPpkEeO_u4Z14juDDg" visible="false" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_efltOfpkEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_yyXeMM2TEeOtK5GsJlm5Mw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_efltOvpkEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efltO_pkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efltPPpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efltPfpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efltPvpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efltP_pkEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efltQPpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efltQfpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efltQvpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efltQ_pkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efltRPpkEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efltRfpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efltRvpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efltR_pkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efltSPpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efltSfpkEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efltSvpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efltS_pkEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#GraphicalElement"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efltTPpkEeO_u4Z14juDDg" x="319" width="121" height="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_efmUZfpkEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efmUZvpkEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efmUZ_pkEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efmUaPpkEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efmUafpkEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efmUavpkEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efmUa_pkEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_efmUbPpkEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efmUbfpkEeO_u4Z14juDDg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efmUbvpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efmUb_pkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efmUcPpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efmUcfpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efmUcvpkEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efmUc_pkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efmUdPpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efmUdfpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efmUdvpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efmUd_pkEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efmUePpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efmUefpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efmUevpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efmUe_pkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efmUfPpkEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efmUffpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efmUfvpkEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#ClipPath"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efmUf_pkEeO_u4Z14juDDg" x="160" y="199" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_efm7dPpkEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efm7dfpkEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efm7dvpkEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efm7d_pkEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efm7ePpkEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efm7efpkEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efm7evpkEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_efm7e_pkEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efm7fPpkEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_efm7ffpkEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Marker-size"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_efm7fvpkEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_efm7f_pkEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Marker-reference"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_efm7gPpkEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efm7gfpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efm7gvpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efm7g_pkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efm7hPpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efm7hfpkEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efm7hvpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efm7h_pkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efm7iPpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efm7ifpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efm7ivpkEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efm7i_pkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efm7jPpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efm7jfpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efm7jvpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efm7j_pkEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efm7kPpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efm7kfpkEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Marker"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efm7kvpkEeO_u4Z14juDDg" x="460" y="199" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_efpXkPpkEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efpXkfpkEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efpXkvpkEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efpXk_pkEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efpXlPpkEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_efpXlfpkEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_efpXlvpkEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_efpXl_pkEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efpXmPpkEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_efpXmfpkEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_loGuQNTkEeO3TMM_EGdzeA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_efpXmvpkEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efpXm_pkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efpXnPpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efpXnfpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efpXnvpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efpXn_pkEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efpXoPpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efpXofpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efpXovpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efpXo_pkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efpXpPpkEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efpXpfpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_efpXpvpkEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_efpXp_pkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efpXqPpkEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_efpXqfpkEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_efpXqvpkEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efpXq_pkEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Canvas"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_efpXrPpkEeO_u4Z14juDDg" x="299" y="200" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_WKfJ0PpsEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WKfw4PpsEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WKfw4fpsEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WKfw4vpsEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WKfw4_psEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WKfw5PpsEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WKfw5fpsEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WKfw5vpsEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WKfw5_psEeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WKfw6PpsEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WKfw6fpsEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WKfw6vpsEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WKfw6_psEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WKfw7PpsEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WKfw7fpsEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WKfw7vpsEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WKfw7_psEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WKfw8PpsEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WKfw8fpsEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WKfw8vpsEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WKfw8_psEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WKfw9PpsEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WKfw9fpsEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WKl3gPpsEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WKl3gfpsEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WKl3gvpsEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_DH0DwM5yEeOqlr8E3pzO9g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WKfJ0fpsEeO_u4Z14juDDg" x="20" y="299" height="42"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_XXCcgPpsEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XXCcgvpsEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XXCcg_psEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XXCchPpsEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XXCchfpsEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XXDDkPpsEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XXDDkfpsEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_XXDDkvpsEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XXDDk_psEeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XXDDlPpsEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_XXDDlfpsEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_XXDDlvpsEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XXDDl_psEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XXDDmPpsEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XXDDmfpsEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_XXDDmvpsEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_XXDDm_psEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XXDDnPpsEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XXDDnfpsEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XXDDnvpsEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_XXDDn_psEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_XXDDoPpsEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XXDDofpsEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XXH8EPpsEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XXH8EfpsEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XXH8EvpsEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_4ytfwM2CEeOX1ohrWoozJQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XXCcgfpsEeO_u4Z14juDDg" x="640" y="300" height="41"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_c2KRQfpkEeO_u4Z14juDDg"/>
+    <element xmi:type="uml:Package" href="DG.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_efjQ8PpkEeO_u4Z14juDDg" type="4002" source="_efkfEPpkEeO_u4Z14juDDg" target="_efpXkPpkEeO_u4Z14juDDg" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_efjQ8fpkEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_efjQ8vpkEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_efjQ8_pkEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PiDMvo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_efjQ9PpkEeO_u4Z14juDDg" points="[0, 0, 0, -60]$[0, 60, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efjQ9fpkEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efjQ9vpkEeO_u4Z14juDDg" id="(0.5,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_efm7UPpkEeO_u4Z14juDDg" type="4002" source="_efpXkPpkEeO_u4Z14juDDg" target="_eflGRvpkEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_efm7UfpkEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_efm7UvpkEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_efm7U_pkEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcIPo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_efm7VPpkEeO_u4Z14juDDg" points="[8, -61, -41, 120]$[8, -88, -41, 93]$[9, -88, -40, 93]$[9, -120, -40, 61]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efm7VfpkEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efm7VvpkEeO_u4Z14juDDg" id="(0.75,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_efniYPpkEeO_u4Z14juDDg" type="4002" source="_eflGRvpkEeO_u4Z14juDDg" target="_efltMPpkEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_efniYfpkEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_efniYvpkEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_efniY_pkEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcKfo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_efniZPpkEeO_u4Z14juDDg" points="[0, -61, 22, 80]$[0, -101, 22, 40]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efniZfpkEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efniZvpkEeO_u4Z14juDDg" id="(0.33035714285714285,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_efp-oPpkEeO_u4Z14juDDg" type="4002" source="_efm7dPpkEeO_u4Z14juDDg" target="_eflGRvpkEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_efp-ofpkEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_efp-ovpkEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_efp-o_pkEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcL_o2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_efp-pPpkEeO_u4Z14juDDg" points="[0, -61, 124, 120]$[0, -88, 124, 93]$[-124, -88, 0, 93]$[-124, -120, 0, 61]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efp-pfpkEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efp-pvpkEeO_u4Z14juDDg" id="(0.5,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_efp-rvpkEeO_u4Z14juDDg" type="4002" source="_efmUZfpkEeO_u4Z14juDDg" target="_eflGRvpkEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_efp-r_pkEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_efp-sPpkEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_efp-sfpkEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcIvo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_efp-svpkEeO_u4Z14juDDg" points="[0, 0, -135, -60]$[135, 60, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efp-s_pkEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_efp-tPpkEeO_u4Z14juDDg" id="(0.25,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_WKph4PpsEeO_u4Z14juDDg" type="4001" source="_WKfJ0PpsEeO_u4Z14juDDg" target="_efkfEPpkEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WKph4_psEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WKph5PpsEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WKqI8PpsEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WKqI8fpsEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WKqI8vpsEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WKqI8_psEeO_u4Z14juDDg" x="33" y="-14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WKqI9PpsEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WKqI9fpsEeO_u4Z14juDDg" x="-24" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WKqI9vpsEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WKqI9_psEeO_u4Z14juDDg" x="14" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WKqI-PpsEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WKqI-fpsEeO_u4Z14juDDg" x="-19" y="-14"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_WKph4fpsEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_qUuAwM51EeOqlr8E3pzO9g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WKph4vpsEeO_u4Z14juDDg" points="[50, -9, -246, -10]$[203, -9, -93, -10]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_XXLmcPpsEeO_u4Z14juDDg" type="4001" source="_XXCcgPpsEeO_u4Z14juDDg" target="_efkfEPpkEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_XXLmc_psEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XXLmdPpsEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_XXLmdfpsEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XXMNgPpsEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_XXMNgfpsEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XXMNgvpsEeO_u4Z14juDDg" x="56" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_XXMNg_psEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XXMNhPpsEeO_u4Z14juDDg" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_XXMNhfpsEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XXMNhvpsEeO_u4Z14juDDg" x="23" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_XXMNh_psEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XXMNiPpsEeO_u4Z14juDDg" x="16" y="-6"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_XXLmcfpsEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_VJB6MM41EeOqlr8E3pzO9g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XXLmcvpsEeO_u4Z14juDDg" points="[-50, -5, 213, -10]$[-170, -5, 93, -10]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_adyyEPpsEeO_u4Z14juDDg" type="4001" source="_efltMPpkEeO_u4Z14juDDg" target="_eflGRvpkEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_adzZIPpsEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_adzZIfpsEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_adzZIvpsEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_adzZI_psEeO_u4Z14juDDg" x="6" y="-27"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_adzZJPpsEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_adzZJfpsEeO_u4Z14juDDg" x="13" y="-14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_adzZJvpsEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_adzZJ_psEeO_u4Z14juDDg" x="-21" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_adzZKPpsEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_adzZKfpsEeO_u4Z14juDDg" x="-7" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_ad0AMPpsEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_ad0AMfpsEeO_u4Z14juDDg" x="-14" y="-6"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_adyyEfpsEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#A_member_group"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_adyyEvpsEeO_u4Z14juDDg" points="[61, 0, 60, -90]$[181, 0, 180, -90]$[181, 80, 180, -10]$[82, 80, 81, -10]"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_894FgPptEeO_u4Z14juDDg" type="PapyrusUMLClassDiagram" name="Style Sheets" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_C8VoAPpuEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C8VoAvpuEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C8VoA_puEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C8VoBPpuEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C8VoBfpuEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C8VoBvpuEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C8VoB_puEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_C8WPEPpuEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8WPEfpuEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_iNNp8PpuEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Style-fillOpacity"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_iNNp8fpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_iNNp8vpuEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Style-strokeWidth"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_iNNp8_puEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_iNORAPpuEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Style-strokeOpacity"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_iNORAfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_iNORAvpuEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Style-strokeDashLength"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_iNORA_puEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_iNO4EPpuEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Style-fontSize"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_iNO4EfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_iNO4EvpuEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Style-fontName"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_iNO4E_puEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_iNO4FPpuEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Style-fontItalic"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_iNO4FfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_iNPfIPpuEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Style-fontBold"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_iNPfIfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_iNPfIvpuEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Style-fontStrikeThrough"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_iNPfI_puEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8WPEvpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C8WPE_puEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C8WPFPpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8WPFfpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8WPFvpuEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8WPF_puEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C8WPGPpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C8WPGfpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8WPGvpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8WPG_puEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8WPHPpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C8WPHfpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C8WPHvpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8WPH_puEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8bHkPpuEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8bHkfpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8bHkvpuEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Style"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8VoAfpuEeO_u4Z14juDDg" x="140" y="140" height="161"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_C8eK4PpuEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C8eK4vpuEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C8eK4_puEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C8eK5PpuEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C8eK5fpuEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C8ex8PpuEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C8ex8fpuEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_C8ex8vpuEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8ex8_puEeO_u4Z14juDDg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8ex9PpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C8ex9fpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C8ex9vpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8ex9_puEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8ex-PpuEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8ex-fpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C8ex-vpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C8ex-_puEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8ex_PpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8ex_fpuEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8ex_vpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C8ex__puEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C8eyAPpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8eyAfpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8jqcPpuEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8jqcfpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8jqcvpuEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_9z_BQM2CEeOX1ohrWoozJQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8eK4fpuEeO_u4Z14juDDg" x="500" y="139" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_C8mGsPpuEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C8mGsvpuEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C8mGs_puEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C8mGtPpuEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C8mtwPpuEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C8mtwfpuEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C8mtwvpuEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_C8mtw_puEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8mtxPpuEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_mWYewPpuEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_OsgrUM2IEeOX1ohrWoozJQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mWYewfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_mWZF0PpuEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_Y03bYM2IEeOX1ohrWoozJQ"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mWZF0fpuEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8mtxfpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C8mtxvpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C8mtx_puEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8mtyPpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8mtyfpuEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8mtyvpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C8mty_puEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C8mtzPpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8mtzfpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8mtzvpuEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8mtz_puEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C8mt0PpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C8mt0fpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8mt0vpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8rmQPpuEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8rmQfpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8rmQvpuEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_ClirwM2DEeOX1ohrWoozJQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8mGsfpuEeO_u4Z14juDDg" x="445" y="240" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_C8uCgPpuEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C8uCgvpuEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C8uCg_puEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C8uChPpuEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C8uChfpuEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_C8uChvpuEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_C8uCh_puEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_C8uCiPpuEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8uCifpuEeO_u4Z14juDDg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8uCivpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C8uCi_puEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C8uCjPpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8uCjfpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8upkPpuEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8upkfpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C8upkvpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C8upk_puEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8uplPpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8uplfpuEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8uplvpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_C8upl_puEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_C8upmPpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8upmfpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_C8y7APpuEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_C8y7AfpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8y7AvpuEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_4ytfwM2CEeOX1ohrWoozJQ"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_C8uCgfpuEeO_u4Z14juDDg" x="500" y="20" height="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_TML6wPpuEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TML6wvpuEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TML6w_puEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TML6xPpuEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TML6xfpuEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TMMh0PpuEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TMMh0fpuEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TMMh0vpuEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TMMh0_puEeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TMMh1PpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_TMMh1fpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_TMMh1vpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TMMh1_puEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TMMh2PpuEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TMMh2fpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_TMMh2vpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_TMMh2_puEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TMMh3PpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TMMh3fpuEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TMMh3vpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_TMMh3_puEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_TMMh4PpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TMMh4fpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TMSBYPpuEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TMSBYfpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TMSBYvpuEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_wz9hsM2cEeOtK5GsJlm5Mw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TML6wfpuEeO_u4Z14juDDg" x="180" y="20" width="141" height="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_tQOEYPpuEeO_u4Z14juDDg" type="2006" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tQOEYvpuEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tQOEY_puEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tQOEZPpuEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tQOEZfpuEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tQOEZvpuEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tQOrcPpuEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tQOrcfpuEeO_u4Z14juDDg" type="5023"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_tQOrcvpuEeO_u4Z14juDDg" type="7015">
+        <children xmi:type="notation:Shape" xmi:id="_wa2NUPpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_BWypkM2XEeOtK5GsJlm5Mw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_wa2NUfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_wa20YPpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_G7EKcM2XEeOtK5GsJlm5Mw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_wa20YfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_wa3bcPpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_HEvq4M2XEeOtK5GsJlm5Mw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_wa3bcfpuEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_tQOrc_puEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_tQOrdPpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_tQOrdfpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tQOrdvpuEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_tQSV0PpuEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_tQSV0fpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tQSV0vpuEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="DG.uml#_wgzj4M2WEeOtK5GsJlm5Mw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tQOEYfpuEeO_u4Z14juDDg" x="376" y="20"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_tQUyEPpuEeO_u4Z14juDDg" type="2006" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tQVZIPpuEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tQVZIfpuEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tQVZIvpuEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tQVZI_puEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_tQVZJPpuEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_tQVZJfpuEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_tQVZJvpuEeO_u4Z14juDDg" type="5023"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_tQVZJ_puEeO_u4Z14juDDg" type="7015">
+        <children xmi:type="notation:Shape" xmi:id="_u_lwQPpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_6aYm0ugeEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_lwQfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_mXUPpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_TObvQOgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_mXUfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_mXUvpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_XmBakOgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_mXU_puEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_m-YPpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_iEuOEOgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_m-YfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_m-YvpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_nqm4gOgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_m-Y_puEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_nlcPpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_n3HqgOgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_nlcfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_nlcvpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_n9h0gOgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_nlc_puEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_nldPpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_oEA3AOgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_nldfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_oMgPpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_oJbigOgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_oMgfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_oMgvpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_oO2OAOgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_oMg_puEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_ozkPpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_oXUNgOgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_ozkfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_ozkvpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_ofLJAOgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_ozk_puEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_ozlPpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_oluc8OgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_ozlfpuEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_u_paoPpuEeO_u4Z14juDDg" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="DG.uml#_oz2_kOgfEeO6TvQHODg78w"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_u_paofpuEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_tQVZKPpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_tQVZKfpuEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_tQVZKvpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tQVZK_puEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_tQZDgPpuEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_tQZDgfpuEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tQZDgvpuEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="DG.uml#_6aYm0OgeEeO6TvQHODg78w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tQUyEfpuEeO_u4Z14juDDg" x="20" y="20"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_894FgfptEeO_u4Z14juDDg"/>
+    <element xmi:type="uml:Package" href="DG.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_LeczAPpuEeO_u4Z14juDDg" type="4001" source="_C8mGsPpuEeO_u4Z14juDDg" target="_C8eK4PpuEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_LedaEPpuEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LedaEfpuEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LedaEvpuEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LedaE_puEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LedaFPpuEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LedaFfpuEeO_u4Z14juDDg" x="5" y="-51"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LedaFvpuEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LedaF_puEeO_u4Z14juDDg" x="3" y="-48"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LedaGPpuEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LedaGfpuEeO_u4Z14juDDg" x="5" y="37"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LedaGvpuEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LedaG_puEeO_u4Z14juDDg" x="3" y="31"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_LeczAfpuEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_OTgnYM2GEeOX1ohrWoozJQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LeczAvpuEeO_u4Z14juDDg" points="[20, -61, -26, 101]$[20, -121, -26, 41]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NgHIwPpuEeO_u4Z14juDDg" id="(0.49,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NgHIwfpuEeO_u4Z14juDDg" id="(0.66,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_LelV4PpuEeO_u4Z14juDDg" type="4001" source="_C8VoAPpuEeO_u4Z14juDDg" target="_C8eK4PpuEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Lel88PpuEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Lel88fpuEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Lel88vpuEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Lel88_puEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Lel89PpuEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Lel89fpuEeO_u4Z14juDDg" x="11" y="-14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Lel89vpuEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Lel89_puEeO_u4Z14juDDg" x="-25" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Lel8-PpuEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Lel8-fpuEeO_u4Z14juDDg" x="22" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Lel8-vpuEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Lel8-_puEeO_u4Z14juDDg" x="-20" y="-14"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_LelV4fpuEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_vnz5oM2GEeOX1ohrWoozJQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LelV4vpuEeO_u4Z14juDDg" points="[109, -143, -167, 19]$[243, -143, -33, 19]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NgF6oPpuEeO_u4Z14juDDg" id="(0.52,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NgF6ofpuEeO_u4Z14juDDg" id="(0.33,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Let4wPpuEeO_u4Z14juDDg" type="4001" source="_C8eK4PpuEeO_u4Z14juDDg" target="_C8uCgPpuEeO_u4Z14juDDg" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Leuf0PpuEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Leuf0fpuEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Leuf0vpuEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Leuf0_puEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Leuf1PpuEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Leuf1fpuEeO_u4Z14juDDg" x="1" y="-32"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Leuf1vpuEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Leuf1_puEeO_u4Z14juDDg" x="6" y="45"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LevG4PpuEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LevG4fpuEeO_u4Z14juDDg" x="1" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LevG4vpuEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LevG4_puEeO_u4Z14juDDg" x="6" y="-19"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Let4wfpuEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_QZkcUM2DEeOX1ohrWoozJQ"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Let4wvpuEeO_u4Z14juDDg" points="[0, 0, 0, -60]$[0, 60, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NgGhsPpuEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_NgGhsfpuEeO_u4Z14juDDg" id="(0.5,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_TMVEsPpuEeO_u4Z14juDDg" type="4001" source="_TML6wPpuEeO_u4Z14juDDg" target="_C8VoAPpuEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TMVrwPpuEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TMVrwfpuEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TMVrwvpuEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TMVrw_puEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TMVrxPpuEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TMVrxfpuEeO_u4Z14juDDg" x="9" y="-15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TMVrxvpuEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TMVrx_puEeO_u4Z14juDDg" x="-8" y="29"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TMVryPpuEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TMVryfpuEeO_u4Z14juDDg" x="9" y="29"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TMVryvpuEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TMWS0PpuEeO_u4Z14juDDg" x="-8" y="-17"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_TMVEsfpuEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#A_fill_style"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TMVEsvpuEeO_u4Z14juDDg" points="[-50, 28, -57, -185]$[-50, 138, -57, -75]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UBCfIPpuEeO_u4Z14juDDg" type="4001" source="_TML6wPpuEeO_u4Z14juDDg" target="_C8VoAPpuEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UBDGMPpuEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UBDGMfpuEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UBDGMvpuEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UBDGM_puEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UBDtQPpuEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UBDtQfpuEeO_u4Z14juDDg" x="9" y="-25"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UBDtQvpuEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UBDtQ_puEeO_u4Z14juDDg" x="-8" y="29"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UBDtRPpuEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UBDtRfpuEeO_u4Z14juDDg" x="9" y="30"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UBDtRvpuEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UBDtR_puEeO_u4Z14juDDg" x="-8" y="-17"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UBCfIfpuEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_KeO_IM2rEeOtK5GsJlm5Mw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UBCfIvpuEeO_u4Z14juDDg" points="[50, 28, 43, -185]$[50, 138, 43, -75]"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_rET7kPpwEeO_u4Z14juDDg" type="PapyrusUMLClassDiagram" name="Path Commands" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_sfsUcPpwEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sfs7gPpwEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sfs7gfpwEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sfs7gvpwEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sfs7g_pwEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_sfs7hPpwEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_sftikPpwEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_sftikfpwEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_sftikvpwEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_TriB0PpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#PathCommand-isRelative"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_TriB0fpxEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_sftik_pwEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_sftilPpwEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_sftilfpwEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sftilvpwEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_sftil_pwEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_sftimPpwEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_sftimfpwEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_sftimvpwEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sftim_pwEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_sftinPpwEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_sftinfpwEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_sftinvpwEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_sftin_pwEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sftioPpwEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_sfzpMPpwEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_sfzpMfpwEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sfzpMvpwEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#PathCommand"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sfsUcfpwEeO_u4Z14juDDg" x="200" y="20" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EiQVkPpxEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiQVkvpxEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EiQVk_pxEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiQVlPpxEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EiQVlfpxEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiQVlvpxEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EiQ8oPpxEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EiQ8ofpxEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiQ8ovpxEeO_u4Z14juDDg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiQ8o_pxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EiQ8pPpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EiQ8pfpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiQ8pvpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiQ8p_pxEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiQ8qPpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EiQ8qfpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EiQ8qvpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiQ8q_pxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiQ8rPpxEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiQ8rfpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EiQ8rvpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EiQ8r_pxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiQ8sPpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiWcMPpxEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiWcMfpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiWcMvpxEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#ClosePath"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiQVkfpxEeO_u4Z14juDDg" x="10" y="137" height="45"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EiZfgPpxEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiZfgvpxEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EiZfg_pxEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiZfhPpxEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EiZfhfpxEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiZfhvpxEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EiaGkPpxEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EiaGkfpxEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiaGkvpxEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_flOzsPpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#CubicCurveTo-startControl"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_flOzsfpxEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_flOzsvpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#CubicCurveTo-endControl"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_flOzs_pxEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_flPawPpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#CubicCurveTo-point"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_flPawfpxEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiaGk_pxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EiaGlPpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EiaGlfpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiaGlvpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiaGl_pxEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiaGmPpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EiaGmfpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EiaGmvpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiaGm_pxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiaGnPpxEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiaGnfpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EiaGnvpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EiaGn_pxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiaGoPpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Eie_EPpxEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Eie_EfpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Eie_EvpxEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#CubicCurveTo"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiZfgfpxEeO_u4Z14juDDg" x="40" y="216" height="85"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EiiCYPpxEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiiCYvpxEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EiiCY_pxEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiiCZPpxEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EiiCZfpxEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiiCZvpxEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EiiCZ_pxEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EiiCaPpxEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiiCafpxEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_flMXcPpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#EllipticalArcTo-radii"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_flMXcfpxEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_flMXcvpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#EllipticalArcTo-rotation"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_flMXc_pxEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_flM-gPpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#EllipticalArcTo-isLargeArc"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_flM-gfpxEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_flNlkPpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#EllipticalArcTo-isSweep"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_flNlkfpxEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_flNlkvpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#EllipticalArcTo-point"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_flNlk_pxEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiiCavpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EiiCa_pxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EiiCbPpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiiCbfpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiiCbvpxEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiiCb_pxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EiiCcPpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EiiCcfpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiiCcvpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiipcPpxEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiipcfpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EiipcvpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Eiipc_pxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiipdPpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Eim64PpxEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Eim64fpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Eim64vpxEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#EllipticalArcTo"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiiCYfpxEeO_u4Z14juDDg" x="211" y="216" height="105"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Eip-MPpxEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiqlQPpxEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EiqlQfpxEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiqlQvpxEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EiqlQ_pxEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiqlRPpxEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EiqlRfpxEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EiqlRvpxEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiqlR_pxEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_flOMoPpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#LineTo-point"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_flOMofpxEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiqlSPpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EiqlSfpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EiqlSvpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiqlS_pxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiqlTPpxEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiqlTfpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EiqlTvpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EiqlT_pxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiqlUPpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EiqlUfpxEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EiqlUvpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EiqlU_pxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EiqlVPpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiqlVfpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EivdwPpxEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EivdwfpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EivdwvpxEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#LineTo"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Eip-MfpxEeO_u4Z14juDDg" x="160" y="141" height="45"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_EiyhEPpxEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EiyhEvpxEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EizIIPpxEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EizIIfpxEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EizIIvpxEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EizII_pxEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EizIJPpxEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_EizIJfpxEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EizIJvpxEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_flOMovpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#MoveTo-point"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_flOMo_pxEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EizIJ_pxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EizIKPpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EizIKfpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EizIKvpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EizIK_pxEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EizILPpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EizILfpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EizILvpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EizIL_pxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EizIMPpxEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EizIMfpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_EizIMvpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_EizIM_pxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EizINPpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ei4nsPpxEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Ei4nsfpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ei4nsvpxEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#MoveTo"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EiyhEfpxEeO_u4Z14juDDg" x="334" y="141" height="45"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Ei7rAPpxEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ei7rAvpxEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ei7rA_pxEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ei7rBPpxEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ei7rBfpxEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ei7rBvpxEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ei7rB_pxEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Ei7rCPpxEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ei8SEPpxEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_flPawvpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#QuadraticCurveTo-control"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_flPaw_pxEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_flQB0PpxEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#QuadraticCurveTo-point"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_flQB0fpxEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Ei8SEfpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Ei8SEvpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ei8SE_pxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ei8SFPpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ei8SFfpxEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Ei8SFvpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Ei8SF_pxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ei8SGPpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ei8SGfpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ei8SGvpxEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Ei8SG_pxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Ei8SHPpxEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ei8SHfpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ei8SHvpxEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_EjBKkPpxEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_EjBKkfpxEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EjBKkvpxEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#QuadraticCurveTo"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ei7rAfpxEeO_u4Z14juDDg" x="400" y="216" height="65"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_rET7kfpwEeO_u4Z14juDDg"/>
+    <element xmi:type="uml:Package" href="DG.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_Ftrm4PpxEeO_u4Z14juDDg" type="4002" source="_EiQVkPpxEeO_u4Z14juDDg" target="_sfsUcPpwEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_FtsN8PpxEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_FtsN8fpxEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Ftrm4fpxEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcI_o2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ftrm4vpxEeO_u4Z14juDDg" points="[0, 0, -364, -60]$[364, 60, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MnSjAvpxEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MnTKEPpxEeO_u4Z14juDDg" id="(0.14,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_GXIzkPpxEeO_u4Z14juDDg" type="4002" source="_EiZfgPpxEeO_u4Z14juDDg" target="_sfsUcPpwEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GXJaoPpxEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GXJaofpxEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_GXIzkfpxEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcJPo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GXIzkvpxEeO_u4Z14juDDg" points="[29, -85, -100, 196]$[29, -188, -100, 93]$[160, -188, 31, 93]$[160, -220, 31, 61]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MnTKEfpxEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MnTKEvpxEeO_u4Z14juDDg" id="(0.28,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_HJT3YPpxEeO_u4Z14juDDg" type="4002" source="_EiiCYPpxEeO_u4Z14juDDg" target="_sfsUcPpwEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_HJUecPpxEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_HJUecfpxEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_HJT3YfpxEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcJvo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HJT3YvpxEeO_u4Z14juDDg" points="[0, 0, -72, -60]$[72, 60, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MnSjAPpxEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MnSjAfpxEeO_u4Z14juDDg" id="(0.42,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Imm70PpxEeO_u4Z14juDDg" type="4002" source="_Eip-MPpxEeO_u4Z14juDDg" target="_sfsUcPpwEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Imm70_pxEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Imm71PpxEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Imm70fpxEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcLfo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Imm70vpxEeO_u4Z14juDDg" points="[0, 0, 73, -60]$[-73, 60, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MnTxIvpxEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MnTxI_pxEeO_u4Z14juDDg" id="(0.57,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_JvDxoPpxEeO_u4Z14juDDg" type="4002" source="_EiyhEPpxEeO_u4Z14juDDg" target="_sfsUcPpwEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_JvEYsPpxEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_JvEYsfpxEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_JvDxofpxEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcMfo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_JvDxovpxEeO_u4Z14juDDg" points="[0, 0, 219, -60]$[-219, 60, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MnTxIPpxEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MnTxIfpxEeO_u4Z14juDDg" id="(0.71,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_LFeyAPpxEeO_u4Z14juDDg" type="4002" source="_Ei7rAPpxEeO_u4Z14juDDg" target="_sfsUcPpwEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_LFfZEPpxEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_LFfZEfpxEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_LFeyAfpxEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcN_o2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_LFeyAvpxEeO_u4Z14juDDg" points="[0, 0, 365, -60]$[-365, 60, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MnR78PpxEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_MnR78fpxEeO_u4Z14juDDg" id="(0.85,0.0)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_BLrl4PpyEeO_u4Z14juDDg" type="PapyrusUMLClassDiagram" name="Transforms" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_QaSeEPpyEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QaSeEvpyEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QaSeE_pyEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QaTFIPpyEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QaTFIfpyEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_QaTFIvpyEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_QaTFI_pyEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_QaTFJPpyEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QaTFJfpyEeO_u4Z14juDDg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QaTFJvpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QaTFJ_pyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QaTFKPpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QaTFKfpyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QaTFKvpyEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QaTFK_pyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QaTFLPpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QaTFLfpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QaTFLvpyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QaTFL_pyEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QaTFMPpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_QaTFMfpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_QaTFMvpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QaTFM_pyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_QaX9oPpyEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_QaX9ofpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QaX9ovpyEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Transform"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QaSeEfpyEeO_u4Z14juDDg" x="240" y="9" height="51"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_SjC6UPpyEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SjC6UvpyEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SjDhYPpyEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SjDhYfpyEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SjDhYvpyEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SjDhY_pyEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SjDhZPpyEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_SjDhZfpyEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SjDhZvpyEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_mwg5MPpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Rotate-angle"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwg5MfpyEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_mwhgQPpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Rotate-center"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwhgQfpyEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SjDhZ_pyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_SjDhaPpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_SjDhafpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SjDhavpyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SjDha_pyEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SjDhbPpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_SjDhbfpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_SjDhbvpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SjDhb_pyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SjDhcPpyEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SjDhcfpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_SjDhcvpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_SjDhc_pyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SjDhdPpyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_SjJoAPpyEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_SjJoAfpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SjJoAvpyEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Rotate"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SjC6UfpyEeO_u4Z14juDDg" x="40" y="120" height="71"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_Te0mEPpyEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Te0mEvpyEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Te0mE_pyEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Te0mFPpyEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Te0mFfpyEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Te0mFvpyEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Te0mF_pyEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_Te0mGPpyEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Te0mGfpyEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_mwhgQvpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Scale-factorX"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwhgQ_pyEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_mwiHUPpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Scale-factorY"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwiHUfpyEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Te1NIPpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Te1NIfpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Te1NIvpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Te1NI_pyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Te1NJPpyEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Te1NJfpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Te1NJvpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Te1NJ_pyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Te1NKPpyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Te1NKfpyEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Te1NKvpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Te1NK_pyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Te1NLPpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Te1NLfpyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Te6FoPpyEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Te6FofpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Te6FovpyEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Scale"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Te0mEfpyEeO_u4Z14juDDg" x="109" y="220" height="71"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_UUYVEPpyEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UUYVEvpyEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UUYVE_pyEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UUYVFPpyEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UUYVFfpyEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_UUY8IPpyEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_UUY8IfpyEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_UUY8IvpyEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UUY8I_pyEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_mwiHUvpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Skew-angleX"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwiHU_pyEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_mwiuYPpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Skew-angleY"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwiuYfpyEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UUY8JPpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UUY8JfpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UUY8JvpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UUY8J_pyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UUY8KPpyEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UUY8KfpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UUY8KvpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UUY8K_pyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UUY8LPpyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UUY8LfpyEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UUY8LvpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_UUY8L_pyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_UUY8MPpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UUY8MfpyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_UUfCwPpyEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_UUfCwfpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UUfCwvpyEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Skew"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UUYVEfpyEeO_u4Z14juDDg" x="200" y="120" height="71"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_WhCZ4PpyEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WhDA8PpyEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WhDA8fpyEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WhDA8vpyEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WhDA8_pyEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WhDA9PpyEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WhDA9fpyEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_WhDA9vpyEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WhDA9_pyEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_mwiuYvpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Translate-deltaX"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwiuY_pyEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_mwjVcPpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Translate-deltaY"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwjVcfpyEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WhDA-PpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WhDA-fpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WhDA-vpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WhDA-_pyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WhDA_PpyEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WhDA_fpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WhDA_vpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WhDA__pyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WhDBAPpyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WhDBAfpyEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WhDBAvpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_WhDBA_pyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_WhDBBPpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WhDBBfpyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_WhJHkPpyEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_WhJHkfpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WhJHkvpyEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Translate"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WhCZ4fpyEeO_u4Z14juDDg" x="260" y="220" height="71"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_YwEdQPpyEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YwEdQvpyEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YwFEUPpyEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YwFEUfpyEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YwFEUvpyEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YwFEU_pyEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YwFEVPpyEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_YwFEVfpyEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YwFEVvpyEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_mwjVcvpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Matrix-a"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwjVc_pyEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_mwj8gPpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Matrix-b"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwj8gfpyEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_mwj8gvpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Matrix-c"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwj8g_pyEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_mwj8hPpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Matrix-d"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwj8hfpyEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_mwkjkPpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Matrix-e"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwkjkfpyEeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_mwkjkvpyEeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Matrix-f"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_mwkjk_pyEeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YwFEV_pyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_YwFEWPpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_YwFEWfpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YwFEWvpyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YwFEW_pyEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YwFEXPpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_YwFEXfpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_YwFEXvpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YwFEX_pyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YwFEYPpyEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YwFEYfpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_YwFEYvpyEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_YwFEY_pyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YwFEZPpyEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_YwLK8PpyEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_YwLK8fpyEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YwLK8vpyEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Matrix"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YwEdQfpyEeO_u4Z14juDDg" x="380" y="120" height="112"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_BLrl4fpyEeO_u4Z14juDDg"/>
+    <element xmi:type="uml:Package" href="DG.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_SjMrUPpyEeO_u4Z14juDDg" type="4002" source="_SjC6UPpyEeO_u4Z14juDDg" target="_QaSeEPpyEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_SjNSYPpyEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_SjNSYfpyEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_SjMrUfpyEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PiDM_o2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SjMrUvpyEeO_u4Z14juDDg" points="[0, 0, -286, -60]$[286, 60, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bd58gPpyEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bd6jkPpyEeO_u4Z14juDDg" id="(0.16,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Te9I8PpyEeO_u4Z14juDDg" type="4002" source="_Te0mEPpyEeO_u4Z14juDDg" target="_QaSeEPpyEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Te9wAPpyEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Te9wAfpyEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Te9I8fpyEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PiDNPo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Te9I8vpyEeO_u4Z14juDDg" points="[16, -71, -233, 211]$[16, -199, -233, 83]$[266, -199, 17, 83]$[266, -231, 17, 51]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bd6jkfpyEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bd6jkvpyEeO_u4Z14juDDg" id="(0.33,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_UUitIPpyEeO_u4Z14juDDg" type="4002" source="_UUYVEPpyEeO_u4Z14juDDg" target="_QaSeEPpyEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_UUjUMPpyEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_UUjUMfpyEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_UUitIfpyEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PiDNfo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UUitIvpyEeO_u4Z14juDDg" points="[0, 0, 0, -60]$[0, 60, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bd7xsPpyEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bd7xsfpyEeO_u4Z14juDDg" id="(0.5,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_WhMK4PpyEeO_u4Z14juDDg" type="4002" source="_WhCZ4PpyEeO_u4Z14juDDg" target="_QaSeEPpyEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_WhMx8PpyEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_WhMx8fpyEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_WhMK4fpyEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PiDN_o2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_WhMK4vpyEeO_u4Z14juDDg" points="[27, -71, -106, 211]$[27, -199, -106, 83]$[117, -199, -16, 83]$[117, -231, -16, 51]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bd7KoPpyEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bd7KofpyEeO_u4Z14juDDg" id="(0.66,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_YwO1UPpyEeO_u4Z14juDDg" type="4002" source="_YwEdQPpyEeO_u4Z14juDDg" target="_QaSeEPpyEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_YwO1U_pyEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_YwO1VPpyEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_YwO1UfpyEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcMPo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YwO1UvpyEeO_u4Z14juDDg" points="[0, 0, 287, -60]$[-287, 60, 0, 0]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bd7xsvpyEeO_u4Z14juDDg" id="(0.5,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bd7xs_pyEeO_u4Z14juDDg" id="(0.83,0.0)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_EUZ04PpzEeO_u4Z14juDDg" type="PapyrusUMLClassDiagram" name="Paint Servers" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_GzPO0PpzEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GzP14PpzEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GzP14fpzEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GzP14vpzEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GzP14_pzEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GzP15PpzEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GzP15fpzEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GzP15vpzEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GzP15_pzEeO_u4Z14juDDg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GzP16PpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GzP16fpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GzP16vpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzP16_pzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GzP17PpzEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GzP17fpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GzP17vpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GzP17_pzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzP18PpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GzP18fpzEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GzP18vpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GzP18_pzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GzP19PpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzP19fpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GzV8gPpzEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GzV8gfpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzV8gvpzEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Fill"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzPO0fpzEeO_u4Z14juDDg" x="340" y="140" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_GzYYwPpzEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GzYYwvpzEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GzYYw_pzEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GzYYxPpzEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GzYYxfpzEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_GzYYxvpzEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_GzYYx_pzEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_GzYYyPpzEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GzYYyfpzEeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GzYYyvpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GzYYy_pzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GzYYzPpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzYYzfpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GzY_0PpzEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GzY_0fpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GzY_0vpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GzY_0_pzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzY_1PpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_GzY_1fpzEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_GzY_1vpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_GzY_1_pzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_GzY_2PpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzY_2fpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Gzd4UPpzEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Gzd4UfpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Gzd4UvpzEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_CwockM6jEeOqlr8E3pzO9g"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_GzYYwfpzEeO_u4Z14juDDg" x="340" y="60" height="40"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_KUJJwPpzEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KUJw0PpzEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KUJw0fpzEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KUJw0vpzEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KUJw0_pzEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_KUJw1PpzEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_KUJw1fpzEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_KUJw1vpzEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KUJw1_pzEeO_u4Z14juDDg" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_KUJw2PpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_KUJw2fpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_KUJw2vpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KUJw2_pzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KUJw3PpzEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_KUJw3fpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_KUJw3vpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_KUJw3_pzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KUJw4PpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KUKX4PpzEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_KUKX4fpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_KUKX4vpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_KUKX4_pzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KUKX5PpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_KUQegPpzEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_KUQegfpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KUQegvpzEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Gradient"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KUJJwfpzEeO_u4Z14juDDg" x="140" y="259" height="81"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_LiDHUPpzEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LiDHUvpzEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LiDHU_pzEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LiDHVPpzEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LiDHVfpzEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LiDuYPpzEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LiDuYfpzEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_LiDuYvpzEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LiDuY_pzEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_2E_d8Pp0EeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#GradientStop-color"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2E_d8fp0EeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_2E_d8vp0EeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#GradientStop-offset"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2E_d8_p0EeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_2E_d9Pp0EeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#GradientStop-opacity"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2E_d9fp0EeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LiDuZPpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LiDuZfpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LiDuZvpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LiDuZ_pzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LiDuaPpzEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LiDuafpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LiDuavpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LiDua_pzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LiDubPpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LiDubfpzEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LiDubvpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_LiDub_pzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_LiDucPpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LiDucfpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_LiIm4PpzEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_LiIm4fpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LiIm4vpzEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#GradientStop"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LiDHUfpzEeO_u4Z14juDDg" x="360" y="400" height="81"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_OWhaEPpzEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OWhaEvpzEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OWiBIPpzEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OWiBIfpzEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OWiBIvpzEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_OWiBI_pzEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_OWiBJPpzEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_OWiBJfpzEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_OWiBJvpzEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_2E9BsPp0EeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_nIr7gNpbEeOltvy1wTDHDA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2E9Bsfp0EeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_2E9owPp0EeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_oaTUYNpbEeOltvy1wTDHDA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2E9owfp0EeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_OWiBJ_pzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_OWiBKPpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_OWiBKfpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OWiBKvpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_OWiBK_pzEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_OWiBLPpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_OWiBLfpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_OWiBLvpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OWiBL_pzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_OWiBMPpzEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_OWiBMfpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_OWiBMvpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_OWiBM_pzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OWiBNPpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_OWoHwPpzEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_OWoHwfpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OWoHwvpzEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#LinearGradient"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OWhaEfpzEeO_u4Z14juDDg" x="200" y="400" height="81"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_TvJEkPpzEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TvJEkvpzEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TvJroPpzEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TvJrofpzEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TvJrovpzEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TvJro_pzEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TvJrpPpzEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_TvJrpfpzEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TvJrpvpzEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_2E9owvp0EeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_u_spINpdEeOltvy1wTDHDA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2E9ow_p0EeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_2E-P0Pp0EeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_0SIMENpdEeOltvy1wTDHDA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2E-P0fp0EeO_u4Z14juDDg"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_2E-P0vp0EeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#RadialGradient-radius"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2E-P0_p0EeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TvJrp_pzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_TvJrqPpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_TvJrqfpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TvJrqvpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TvJrq_pzEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TvJrrPpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_TvJrrfpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_TvJrrvpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TvJrr_pzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TvJrsPpzEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TvJrsfpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_TvJrsvpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_TvJrs_pzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TvJrtPpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_TvPLMPpzEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_TvPLMfpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TvPLMvpzEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#RadialGradient"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TvJEkfpzEeO_u4Z14juDDg" x="60" y="400" height="83"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_XliHUPpzEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XliuYPpzEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XliuYfpzEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XliuYvpzEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XliuY_pzEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_XliuZPpzEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_XliuZfpzEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_XliuZvpzEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XljVcPpzEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_2E-24Pp0EeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#Pattern-bounds"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2E-24fp0EeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XljVcfpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_XljVcvpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_XljVc_pzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XljVdPpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XljVdfpzEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XljVdvpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_XljVd_pzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_XljVePpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XljVefpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XljVevpzEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XljVe_pzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_XljVfPpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_XljVffpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XljVfvpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_XlpcEPpzEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_XlpcEfpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XlpcEvpzEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Pattern"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XliHUfpzEeO_u4Z14juDDg" x="590" y="260" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_iI3jMPpzEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iI4KQPpzEeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iI4KQfpzEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iI4KQvpzEeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iI4KQ_pzEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_iI4KRPpzEeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_iI4KRfpzEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_iI4KRvpzEeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iI4KR_pzEeO_u4Z14juDDg" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_2E-24vp0EeO_u4Z14juDDg" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="DG.uml#_Mg5i0M2dEeOtK5GsJlm5Mw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_2E-24_p0EeO_u4Z14juDDg"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iI4KSPpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iI4KSfpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iI4KSvpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iI4KS_pzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iI4KTPpzEeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iI4KTfpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iI4KTvpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iI4KT_pzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iI4KUPpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iI4KUfpzEeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iI4KUvpzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_iI4KU_pzEeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_iI4KVPpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iI4KVfpzEeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_iI-38PpzEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_iI-38fpzEeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iI-38vpzEeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#_wz9hsM2cEeOtK5GsJlm5Mw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_iI3jMfpzEeO_u4Z14juDDg" x="600" y="140" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_AgZiUPp0EeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgZiUvp0EeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgZiU_p0EeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgZiVPp0EeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgaJYPp0EeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_AgaJYfp0EeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_AgaJYvp0EeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_AgaJY_p0EeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_AgaJZPp0EeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_AgaJZfp0EeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_AgaJZvp0EeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_AgaJZ_p0EeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AgaJaPp0EeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_AgaJafp0EeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_AgaJavp0EeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_AgaJa_p0EeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_AgaJbPp0EeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AgaJbfp0EeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_AgaJbvp0EeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_AgaJb_p0EeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_AgaJcPp0EeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_AgaJcfp0EeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AgaJcvp0EeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Agfo8Pp0EeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Agfo8fp0EeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Agfo8vp0EeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#Transform"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AgZiUfp0EeO_u4Z14juDDg" x="60" y="140" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CZa5cPp0EeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CZbggPp0EeO_u4Z14juDDg" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CZbggfp0EeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CZbggvp0EeO_u4Z14juDDg" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CZbgg_p0EeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CZbghPp0EeO_u4Z14juDDg" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CZbghfp0EeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CZbghvp0EeO_u4Z14juDDg" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CZbgh_p0EeO_u4Z14juDDg" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CZbgiPp0EeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CZbgifp0EeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CZbgivp0EeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CZbgi_p0EeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CZbgjPp0EeO_u4Z14juDDg" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CZbgjfp0EeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CZbgjvp0EeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CZbgj_p0EeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CZbgkPp0EeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CZcHkPp0EeO_u4Z14juDDg" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CZcHkfp0EeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CZcHkvp0EeO_u4Z14juDDg"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CZcHk_p0EeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CZcHlPp0EeO_u4Z14juDDg"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CZhnIPp0EeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CZhnIfp0EeO_u4Z14juDDg"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CZhnIvp0EeO_u4Z14juDDg"/>
+      </children>
+      <element xmi:type="uml:Class" href="DG.uml#GraphicalElement"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CZa5cfp0EeO_u4Z14juDDg" x="600" y="400" width="120" height="41"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_EUZ04fpzEeO_u4Z14juDDg"/>
+    <element xmi:type="uml:Package" href="DG.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_GzgUkPpzEeO_u4Z14juDDg" type="4002" source="_GzPO0PpzEeO_u4Z14juDDg" target="_GzYYwPpzEeO_u4Z14juDDg" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_GzgUk_pzEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_GzgUlPpzEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_GzgUkfpzEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcMvo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_GzgUkvpzEeO_u4Z14juDDg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_KUS6wPpzEeO_u4Z14juDDg" type="4002" source="_KUJJwPpzEeO_u4Z14juDDg" target="_GzPO0PpzEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_KUS6w_pzEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_KUS6xPpzEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_KUS6wfpzEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcJ_o2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_KUS6wvpzEeO_u4Z14juDDg" points="[0, -40, -200, 89]$[0, -59, -200, 70]$[210, -59, 10, 70]$[210, -98, 10, 31]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_OWqkAPpzEeO_u4Z14juDDg" type="4002" source="_OWhaEPpzEeO_u4Z14juDDg" target="_KUJJwPpzEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_OWqkA_pzEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_OWqkBPpzEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_OWqkAfpzEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcLPo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_OWqkAvpzEeO_u4Z14juDDg" points="[0, -50, 39, 101]$[0, -70, 39, 81]$[-49, -70, -10, 81]$[-49, -110, -10, 41]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_TvRncPpzEeO_u4Z14juDDg" type="4002" source="_TvJEkPpzEeO_u4Z14juDDg" target="_KUJJwPpzEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_TvRnc_pzEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_TvRndPpzEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_TvRncfpzEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PiDMPo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TvRncvpzEeO_u4Z14juDDg" points="[0, -51, -75, 101]$[0, -71, -75, 81]$[65, -71, -10, 81]$[65, -111, -10, 41]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_Xlr4UPpzEeO_u4Z14juDDg" type="4002" source="_XliHUPpzEeO_u4Z14juDDg" target="_GzPO0PpzEeO_u4Z14juDDg" routing="Tree" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_Xlr4U_pzEeO_u4Z14juDDg" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_Xlr4VPpzEeO_u4Z14juDDg" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_Xlr4UfpzEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="DG.uml#_2PhcNPo2EeOw_Nx9vOEGaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Xlr4UvpzEeO_u4Z14juDDg" points="[0, -30, 265, 90]$[0, -50, 265, 70]$[-255, -50, 10, 70]$[-255, -89, 10, 31]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_26tacPpzEeO_u4Z14juDDg" type="4001" source="_LiDHUPpzEeO_u4Z14juDDg" target="_KUJJwPpzEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_26uBgPpzEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_26uBgfpzEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_26uBgvpzEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_26uBg_pzEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_26uBhPpzEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_26uBhfpzEeO_u4Z14juDDg" x="-11" y="-40"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_26uokPpzEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_26uokfpzEeO_u4Z14juDDg" x="-5" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_26uokvpzEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_26uok_pzEeO_u4Z14juDDg" x="-11" y="17"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_26uolPpzEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_26uolfpzEeO_u4Z14juDDg" x="14" y="-6"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_26tacfpzEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_hQOVgM41EeOqlr8E3pzO9g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_26tacvpzEeO_u4Z14juDDg" points="[-2, -40, 250, 100]$[-2, -140, 250, 0]$[-202, -140, 50, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_351VIPpzEeO_u4Z14juDDg" type="4001" source="_GzPO0PpzEeO_u4Z14juDDg" target="_iI3jMPpzEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_3518MPpzEeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3518MfpzEeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3518MvpzEeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3518M_pzEeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3518NPpzEeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3518NfpzEeO_u4Z14juDDg" x="31" y="-13"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3518NvpzEeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3518N_pzEeO_u4Z14juDDg" x="-12" y="7"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_3518OPpzEeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_3518OfpzEeO_u4Z14juDDg" x="10" y="7"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_352jQPpzEeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_352jQfpzEeO_u4Z14juDDg" x="-3" y="-13"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_351VIfpzEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_VGk7AM2kEeOtK5GsJlm5Mw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_351VIvpzEeO_u4Z14juDDg" points="[50, -10, -240, -9]$[230, -10, -60, -9]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_AgiFMPp0EeO_u4Z14juDDg" type="4001" source="_AgZiUPp0EeO_u4Z14juDDg" target="_GzPO0PpzEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_AgisQPp0EeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AgisQfp0EeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_AgisQvp0EeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AgisQ_p0EeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_AgisRPp0EeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AgisRfp0EeO_u4Z14juDDg" x="27" y="-15"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_AgisRvp0EeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AgisR_p0EeO_u4Z14juDDg" x="-35" y="5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_AgisSPp0EeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AgisSfp0EeO_u4Z14juDDg" x="3" y="5"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_AgisSvp0EeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_AgjTUPp0EeO_u4Z14juDDg" x="-16" y="-15"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_AgiFMfp0EeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#_oEGFIM55EeOqlr8E3pzO9g"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AgiFMvp0EeO_u4Z14juDDg" points="[50, -10, -230, -10]$[230, -10, -50, -10]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_CZkDYPp0EeO_u4Z14juDDg" type="4001" source="_CZa5cPp0EeO_u4Z14juDDg" target="_XliHUPpzEeO_u4Z14juDDg" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CZkDY_p0EeO_u4Z14juDDg" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CZkDZPp0EeO_u4Z14juDDg" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CZkDZfp0EeO_u4Z14juDDg" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CZkDZvp0EeO_u4Z14juDDg" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CZkqcPp0EeO_u4Z14juDDg" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CZkqcfp0EeO_u4Z14juDDg" x="18" y="-34"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CZkqcvp0EeO_u4Z14juDDg" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CZkqc_p0EeO_u4Z14juDDg" x="-11" y="37"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CZkqdPp0EeO_u4Z14juDDg" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CZkqdfp0EeO_u4Z14juDDg" x="18" y="21"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_CZkqdvp0EeO_u4Z14juDDg" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_CZkqd_p0EeO_u4Z14juDDg" x="-11" y="-33"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_CZkDYfp0EeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="DG.uml#A_tile_pattern"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_CZkDYvp0EeO_u4Z14juDDg" points="[0, -30, 5, 120]$[0, -109, 5, 41]"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.uml b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.uml
new file mode 100644
index 00000000000..d1b4b920849
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DG.uml
@@ -0,0 +1,1297 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+  <uml:Package xmi:id="_0" name="DG" URI="http://www.omg.org/spec/DD/20110901/DG">
+    <ownedComment xmi:id="_ownedComment.0" annotatedElement="_0">
+      <body>The Diagram Graphics (DG) package contains a model of graphical primitives that can be instantiated when mapping from a language abstract syntax models and diagram interchange (DI) models to visual presentations. The mapping effectively defines the concrete syntax of a language. This specification does not restrict how the mappings are done, or what languages are used to define them.</body>
+    </ownedComment>
+    <packageImport xmi:id="_packageImport.0">
+      <importedPackage href="DC.uml#_0"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Class" xmi:id="Canvas" name="Canvas">
+      <ownedComment xmi:id="Canvas-_ownedComment.0" annotatedElement="Canvas">
+        <body>Canvas is a kind of group that has bounds.</body>
+      </ownedComment>
+      <ownedRule xmi:id="_roVmMOjLEeO6TvQHODg78w" name="canvas_cannot_have_transforms" constrainedElement="Canvas">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_roVmMejLEeO6TvQHODg78w">
+          <language>OCL</language>
+          <body>transform->isEmpty()</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:id="_2PhcIPo2EeOw_Nx9vOEGaA" general="Group"/>
+      <ownedAttribute xmi:id="_loGuQNTkEeO3TMM_EGdzeA" name="bounds" visibility="public">
+        <ownedComment xmi:id="_loGuQdTkEeO3TMM_EGdzeA" annotatedElement="_loGuQNTkEeO3TMM_EGdzeA">
+          <body>the bounds of the canvas in the x-y coordinate system.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PbVgPo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Circle" name="Circle">
+      <ownedComment xmi:id="Circle-_ownedComment.0" annotatedElement="Circle">
+        <body>Circle is a graphical element that defines a circular shape with a given center point and a radius.</body>
+      </ownedComment>
+      <ownedRule xmi:id="Circle-non_negative_radius" name="non_negative_radius" constrainedElement="Circle">
+        <ownedComment xmi:id="Circle-non_negative_radius-_ownedComment.0" annotatedElement="Circle-non_negative_radius">
+          <body>The radius of a circle cannot be negative</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="Circle-non_negative_radius-_specification">
+          <language>OCL</language>
+          <body>radius >= 0</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:id="_2PhcIfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:id="Circle-center" name="center" visibility="public">
+        <ownedComment xmi:id="Circle-center-_ownedComment.0" annotatedElement="Circle-center">
+          <body>the center point of the circle in the x-y coordinate system.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Circle-radius" name="radius" visibility="public">
+        <ownedComment xmi:id="Circle-radius-_ownedComment.0" annotatedElement="Circle-radius">
+          <body>a real number (>=0) that represents the radius of the circle.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_2Pb8kPo2EeOw_Nx9vOEGaA" value="0"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="ClipPath" name="ClipPath">
+      <ownedComment xmi:id="ClipPath-_ownedComment.0" annotatedElement="ClipPath">
+        <body>ClipPath is a kind of group whose members collectively define a painting mask for its referencing graphical elements.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcIvo2EeOw_Nx9vOEGaA" general="Group"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="ClosePath" name="ClosePath">
+      <ownedComment xmi:id="ClosePath-_ownedComment.0" annotatedElement="ClosePath">
+        <body>ClosePath is a kind of path command that ends the current subpath and causes an automatic straight line to be drawn from the current point to the initial point of the current subpath.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcI_o2EeOw_Nx9vOEGaA" general="PathCommand"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="CubicCurveTo" name="CubicCurveTo">
+      <ownedComment xmi:id="CubicCurveTo-_ownedComment.0" annotatedElement="CubicCurveTo">
+        <body>CubicCurveTo is a kind of path command that draws a cubic bézier curve from the current point to a new point using a start and an end control points.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcJPo2EeOw_Nx9vOEGaA" general="PathCommand"/>
+      <ownedAttribute xmi:id="CubicCurveTo-startControl" name="startControl" visibility="public">
+        <ownedComment xmi:id="CubicCurveTo-startControl-_ownedComment.0" annotatedElement="CubicCurveTo-startControl">
+          <body>the start control point of the cubic bézier curve.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="CubicCurveTo-endControl" name="endControl" visibility="public">
+        <ownedComment xmi:id="CubicCurveTo-endControl-_ownedComment.0" annotatedElement="CubicCurveTo-endControl">
+          <body>the end control point of the cubic bézier curve.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="CubicCurveTo-point" name="point" visibility="public">
+        <ownedComment xmi:id="CubicCurveTo-point-_ownedComment.0" annotatedElement="CubicCurveTo-point">
+          <body>a point to draw a cubic bézier curve to from the current point in the coordinate system.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_CwockM6jEeOqlr8E3pzO9g" name="Definition" isAbstract="true">
+      <ownedComment xmi:id="_k77BMM6jEeOqlr8E3pzO9g" annotatedElement="MoveTo">
+        <body>Definition is an object with an id that can be nested under Definitions.</body>
+      </ownedComment>
+      <ownedRule xmi:id="_0yDOEO08EeOCPtJ2AfZp5A" name="id_cannot_be_empty" constrainedElement="_CwockM6jEeOqlr8E3pzO9g">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_0yDOEe08EeOCPtJ2AfZp5A">
+          <language>OCL</language>
+          <body>id->notEmpty() implies id.size() > 0</body>
+        </specification>
+      </ownedRule>
+      <ownedAttribute xmi:id="_3JUlwM6jEeOqlr8E3pzO9g" name="id" visibility="public" isID="true">
+        <ownedComment xmi:id="_3JUlwc6jEeOqlr8E3pzO9g" annotatedElement="_3JUlwM6jEeOqlr8E3pzO9g">
+          <body>a point to move to in the coordinate system</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pb8kfo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_DH0DwM5yEeOqlr8E3pzO9g" name="Definitions">
+      <ownedComment xmi:id="_dKczUM5_EeOqlr8E3pzO9g" annotatedElement="CubicCurveTo">
+        <body>Definitions nests definitions that are commonly referenced in the containing canvas. It can also nest an embedded stylesheet.</body>
+      </ownedComment>
+      <ownedAttribute xmi:id="_zSdxIM5wEeOqlr8E3pzO9g" name="defnition" visibility="public" type="_CwockM6jEeOqlr8E3pzO9g" isOrdered="true" aggregation="composite" association="_Nti6EM53EeOqlr8E3pzO9g">
+        <ownedComment xmi:id="_zSdxIc5wEeOqlr8E3pzO9g" annotatedElement="_zSdxIM5wEeOqlr8E3pzO9g">
+          <body>A set of clip paths that are referenced by graphical elements in the containing canvas.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pb8kvo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pb8k_o2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Canvas-packagedStyle" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" aggregation="composite" association="_packagedElement.47">
+        <ownedComment xmi:id="Canvas-packagedStyle-_ownedComment.0" annotatedElement="Canvas-packagedStyle">
+          <body>An optional embdded style sheet that that apply to graphical elements in the containing canvas.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pb8lPo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Ellipse" name="Ellipse">
+      <ownedComment xmi:id="Ellipse-_ownedComment.0" annotatedElement="Ellipse">
+        <body>Ellipse is a graphical element that defines an elliptical shape with a given center point and two radii on the x and y axes.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcJfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:id="Ellipse-center" name="center" visibility="public">
+        <ownedComment xmi:id="Ellipse-center-_ownedComment.0" annotatedElement="Ellipse-center">
+          <body>the center point of the ellipse in the x-y coordinate system.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Ellipse-radii" name="radii" visibility="public">
+        <ownedComment xmi:id="Ellipse-radii-_ownedComment.0" annotatedElement="Ellipse-radii">
+          <body>a dimension that specifies the two radii of the ellipse (a width along the x-axis and a height along the y-axis)</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Dimension"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="EllipticalArcTo" name="EllipticalArcTo">
+      <ownedComment xmi:id="EllipticalArcTo-_ownedComment.0" annotatedElement="CubicCurveTo QuadraticCurveTo">
+        <body>EllipticalArcTo is a kind of path command that draws an elliptical arc from the current point to a new point in the coordinate system.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcJvo2EeOw_Nx9vOEGaA" general="PathCommand"/>
+      <ownedAttribute xmi:id="EllipticalArcTo-radii" name="radii" visibility="public">
+        <ownedComment xmi:id="EllipticalArcTo-radii-_ownedComment.0" annotatedElement="EllipticalArcTo-radii">
+          <body>the two radii of the ellipse from which the arc is created.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Dimension"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="EllipticalArcTo-rotation" name="rotation" visibility="public">
+        <ownedComment xmi:id="EllipticalArcTo-rotation-_ownedComment.0" annotatedElement="EllipticalArcTo-rotation">
+          <body>a real number representing a rotation (in degrees) of the ellipse from which the arc is created.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="EllipticalArcTo-isLargeArc" name="isLargeArc" visibility="public">
+        <ownedComment xmi:id="EllipticalArcTo-isLargeArc-_ownedComment.0" annotatedElement="EllipticalArcTo-isLargeArc">
+          <body>whether the arc sweep is equal to or greater than 180 degrees (the large arc).</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="EllipticalArcTo-isSweep" name="isSweep" visibility="public">
+        <ownedComment xmi:id="EllipticalArcTo-isSweep-_ownedComment.0" annotatedElement="EllipticalArcTo-isSweep">
+          <body>whether the arc is drawn in a positive-angle direction</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="EllipticalArcTo-point" name="point" visibility="public">
+        <ownedComment xmi:id="EllipticalArcTo-point-_ownedComment.0" annotatedElement="EllipticalArcTo-point">
+          <body>a point to draw an elliptical arc to from the current point in the coordinate system.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Gradient" name="Gradient" isAbstract="true">
+      <ownedComment xmi:id="Gradient-_ownedComment.0" annotatedElement="Gradient">
+        <body>Gradient is a kind of paint server that serves a continuously smooth color transition along the gradient range from one color to the next.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcJ_o2EeOw_Nx9vOEGaA" general="Fill"/>
+      <ownedAttribute xmi:id="Gradient-stop" name="stop" visibility="public" type="GradientStop" isOrdered="true" aggregation="composite" association="_hQOVgM41EeOqlr8E3pzO9g">
+        <ownedComment xmi:id="Gradient-stop-_ownedComment.0" annotatedElement="Gradient-stop">
+          <body>a list of two or more gradient stops defining the color transitions of the gradient.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PcjoPo2EeOw_Nx9vOEGaA" value="2"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pcjofo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="GradientStop" name="GradientStop">
+      <ownedComment xmi:id="GradientStop-_ownedComment.0" annotatedElement="GradientStop">
+        <body>GradientStop defines a color transition along the distance from a gradient's start to its end offsets.</body>
+      </ownedComment>
+      <ownedRule xmi:id="GradientStop-valid_offset" name="valid_offset" constrainedElement="GradientStop">
+        <ownedComment xmi:id="GradientStop-valid_offset-_ownedComment.0" annotatedElement="GradientStop-valid_offset">
+          <body>the offset must be between 0 and 1.</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="GradientStop-valid_offset-_specification">
+          <language>OCL</language>
+          <body>offset>=0 and offset&lt;=1</body>
+        </specification>
+      </ownedRule>
+      <ownedRule xmi:id="GradientStop-valid_opacity" name="valid_opacity" constrainedElement="GradientStop">
+        <ownedComment xmi:id="GradientStop-valid_opacity-_ownedComment.0" annotatedElement="GradientStop-valid_opacity">
+          <body>the opacity must be between 0 and 1.</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="GradientStop-valid_opacity-_specification">
+          <language>OCL</language>
+          <body>opacity>=0 and opacity&lt;=1</body>
+        </specification>
+      </ownedRule>
+      <ownedAttribute xmi:id="GradientStop-color" name="color" visibility="public">
+        <ownedComment xmi:id="GradientStop-color-_ownedComment.0" annotatedElement="GradientStop-color">
+          <body>the color to use at this gradient stop.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Color"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pcjovo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="GradientStop-offset" name="offset" visibility="public">
+        <ownedComment xmi:id="GradientStop-offset-_ownedComment.0" annotatedElement="GradientStop-offset">
+          <body>an offset of this gradient stop represented as a percentage of the distance between the start and end positions of the gradient along the x and y axes.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pcjo_o2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="GradientStop-opacity" name="opacity" visibility="public">
+        <ownedComment xmi:id="GradientStop-opacity-_ownedComment.0" annotatedElement="GradientStop-opacity">
+          <body>a real number (>=0 and&lt;=1) representing the opacity of the color at the stop. A value of 0 means totally transparent, while a value of 1 means totally opaque.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PcjpPo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="GraphicalElement" name="GraphicalElement" isAbstract="true">
+      <ownedComment xmi:id="GraphicalElement-_ownedComment.0" annotatedElement="GraphicalElement">
+        <body>GraphicalElement is the abstract superclass of all graphical elements that can be nested in a canvas.</body>
+      </ownedComment>
+      <ownedRule xmi:id="_-a2yAOhzEeO6TvQHODg78w" name="referenced_clippath_has_id" constrainedElement="GraphicalElement">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_I9m_EOh0EeO6TvQHODg78w">
+          <language>OCL</language>
+          <body>clipPath->notEmpty() implies clipPath.id->notEmpty()</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:id="_2PhcKPo2EeOw_Nx9vOEGaA" general="_CwockM6jEeOqlr8E3pzO9g"/>
+      <ownedAttribute xmi:id="GraphicalElement-clipPath" name="clipPath" visibility="public" type="ClipPath" association="A_clipPath_clippedElement">
+        <ownedComment xmi:id="GraphicalElement-clipPath-_ownedComment.0" annotatedElement="GraphicalElement-clipPath">
+          <body>A clip path that masks the painting of this graphical element.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pcjpfo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="GraphicalElement-group" name="group" visibility="public" type="Group" association="A_member_group">
+        <ownedComment xmi:id="GraphicalElement-group-_ownedComment.0" annotatedElement="GraphicalElement-group">
+          <body>The group that owns this graphical element.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pcjpvo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_yyXeMM2TEeOtK5GsJlm5Mw" name="class" visibility="public" isOrdered="true">
+        <ownedComment xmi:id="_yyXeMc2TEeOtK5GsJlm5Mw" annotatedElement="_yyXeMM2TEeOtK5GsJlm5Mw">
+          <body>A list of strings representing classes of the graphical element.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKsPo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PdKsfo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="GraphicalElement-localStyle" name="style" visibility="public" type="Style" isOrdered="true" aggregation="composite" association="A_localStyle_styledElement">
+        <ownedComment xmi:id="GraphicalElement-localStyle-_ownedComment.0" annotatedElement="GraphicalElement-localStyle">
+          <body>An inline style that applies on this graphical element.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKsvo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="GraphicalElement-transform" name="transform" visibility="public" type="Transform" isOrdered="true" aggregation="composite" association="_TVnmYM42EeOqlr8E3pzO9g">
+        <ownedComment xmi:id="GraphicalElement-transform-_ownedComment.0" annotatedElement="GraphicalElement-transform">
+          <body>A list of transforms that apply to this graphical element.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKs_o2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PdKtPo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_V0HkgBMTEeSVwtSTQ1YVCg" name="layoutData" visibility="public">
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WEKLoBMTEeSVwtSTQ1YVCg"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WEKLoRMTEeSVwtSTQ1YVCg" value="1"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_WELZwBMTEeSVwtSTQ1YVCg">
+          <value xsi:nil="true"/>
+        </defaultValue>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Group" name="Group">
+      <ownedComment xmi:id="Group-_ownedComment.0" annotatedElement="Group">
+        <body>Group defines a group of graphical elements that can be styled, clipped and/or transformed together.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcKfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:id="Group-member" name="member" visibility="public" type="GraphicalElement" isOrdered="true" aggregation="composite" association="A_member_group">
+        <ownedComment xmi:id="Group-member-_ownedComment.0" annotatedElement="Group-member">
+          <body>A list of graphical elements that are members of this group.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKtfo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PdKtvo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_wT0y8BMSEeSVwtSTQ1YVCg" name="layout" visibility="public">
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wmhsgBMSEeSVwtSTQ1YVCg"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wmiTkBMSEeSVwtSTQ1YVCg" value="1"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_wmkIwBMSEeSVwtSTQ1YVCg">
+          <value xsi:nil="true"/>
+        </defaultValue>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Image" name="Image">
+      <ownedComment xmi:id="Image-_ownedComment.0" annotatedElement="Image">
+        <body>Image is a graphical element that defines a shape that paints an image with a given URL within given bounds.</body>
+      </ownedComment>
+      <ownedRule xmi:id="_6903kOjNEeO6TvQHODg78w" name="source_cannot_be_empty" constrainedElement="Image">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_6903kejNEeO6TvQHODg78w">
+          <language>OCL</language>
+          <body>source->notEmpty() implies source.size() > 0</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:id="_2PhcKvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:id="Image-source" name="source" visibility="public">
+        <ownedComment xmi:id="Image-source-_ownedComment.0" annotatedElement="Image-source">
+          <body>the URL of a referenced image file.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Image-bounds" name="bounds" visibility="public">
+        <ownedComment xmi:id="Image-bounds-_ownedComment.0" annotatedElement="Image-bounds">
+          <body>the bounds within which the image is rendered.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Image-isAspectRatioPreserved" name="isAspectRatioPreserved" visibility="public">
+        <ownedComment xmi:id="Image-isAspectRatioPreserved-_ownedComment.0" annotatedElement="Image-isAspectRatioPreserved">
+          <body>wether to preserve the aspect ratio of the image upon scaling, i.e. the same scale factor for width and height.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_2PdKt_o2EeOw_Nx9vOEGaA" value="false"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Line" name="Line">
+      <ownedComment xmi:id="Line-_ownedComment.0" annotatedElement="Line">
+        <body>Line is a marked element that defines a shape consisting of one straight line between two points.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcK_o2EeOw_Nx9vOEGaA" general="MarkedElement"/>
+      <ownedAttribute xmi:id="Line-start" name="start" visibility="public">
+        <ownedComment xmi:id="Line-start-_ownedComment.0" annotatedElement="Line-start">
+          <body>the starting point of the line in the x-y coordinate system.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Line-end" name="end" visibility="public">
+        <ownedComment xmi:id="Line-end-_ownedComment.0" annotatedElement="Line-end">
+          <body>the ending point of the line in the x-y coordinate system.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="LinearGradient" name="LinearGradient">
+      <ownedComment xmi:id="LinearGradient-_ownedComment.0" annotatedElement="LinearGradient">
+        <body>LinearGradient is a kind of gradient that fills a graphical element by smoothly changing color values along a vector.</body>
+      </ownedComment>
+      <ownedRule xmi:id="LinearGradient-valid_gradient_vector" name="valid_gradient_vector" constrainedElement="LinearGradient">
+        <ownedComment xmi:id="LinearGradient-valid_gradient_vector-_ownedComment.0" annotatedElement="LinearGradient-valid_gradient_vector">
+          <body>all the components of the gradient vector must be between 0 and 1.</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="LinearGradient-valid_gradient_vector-_specification">
+          <language>OCL</language>
+          <body>start.x>=0 and start.x&lt;=1 and end.x>=0 and end.x&lt;=1 and start.y>=0 and start.y&lt;=1 and end.y>=0 and end.y&lt;=1</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:id="_2PhcLPo2EeOw_Nx9vOEGaA" general="Gradient"/>
+      <ownedAttribute xmi:id="_nIr7gNpbEeOltvy1wTDHDA" name="start" visibility="public">
+        <ownedComment xmi:id="_nIr7gdpbEeOltvy1wTDHDA" annotatedElement="_nIr7gNpbEeOltvy1wTDHDA">
+          <body>a starting point for the linear gradient expressed as a percentage along the x and y axes.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_oaTUYNpbEeOltvy1wTDHDA" name="end" visibility="public">
+        <ownedComment xmi:id="_oaTUYdpbEeOltvy1wTDHDA" annotatedElement="_oaTUYNpbEeOltvy1wTDHDA">
+          <body>an ending point for the linear gradient expressed as a percentage along the x and y axes.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="LineTo" name="LineTo">
+      <ownedComment xmi:id="LineTo-_ownedComment.0" annotatedElement="LineTo">
+        <body>LineTo is a kind of path command that draw a straight line from the current point to a new point.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcLfo2EeOw_Nx9vOEGaA" general="PathCommand"/>
+      <ownedAttribute xmi:id="LineTo-point" name="point" visibility="public">
+        <ownedComment xmi:id="LineTo-point-_ownedComment.0" annotatedElement="LineTo-point">
+          <body>a point to draw a straight line to from the current point in the coordinate system.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="MarkedElement" name="MarkedElement" isAbstract="true">
+      <ownedComment xmi:id="MarkedElement-_ownedComment.0" annotatedElement="MarkedElement">
+        <body>MarkedElement is a graphic element that can be decorated at its vertices with markers (e.g. arrowheads).</body>
+      </ownedComment>
+      <ownedRule xmi:id="_wycJoOh1EeO6TvQHODg78w" name="referenced_start_marker_has_id" constrainedElement="MarkedElement">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_wycJoeh1EeO6TvQHODg78w">
+          <language>OCL</language>
+          <body>startMarker->notEmpty() implies startMarker.id->notEmpty()</body>
+        </specification>
+      </ownedRule>
+      <ownedRule xmi:id="_8rYGgOh1EeO6TvQHODg78w" name="referenced_mid_marker_has_id" constrainedElement="MarkedElement">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_8rYGgeh1EeO6TvQHODg78w">
+          <language>OCL</language>
+          <body>midMarker->notEmpty() implies midMarker.id->notEmpty()</body>
+        </specification>
+      </ownedRule>
+      <ownedRule xmi:id="_B10LEOh2EeO6TvQHODg78w" name="referenced_end_marker_has_id" constrainedElement="MarkedElement">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_B10LEeh2EeO6TvQHODg78w">
+          <language>OCL</language>
+          <body>endMarker->notEmpty() implies endMarker.id->notEmpty()</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:id="_2PhcLvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:id="MarkedElement-endMarker" name="endMarker" visibility="public" type="Marker" association="A_endMarker_markedElement">
+        <ownedComment xmi:id="MarkedElement-endMarker-_ownedComment.0" annotatedElement="MarkedElement-endMarker">
+          <body>an optional end marker that aligns with the last vertex of the marked element.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdKuPo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="MarkedElement-midMarker" name="midMarker" visibility="public" type="Marker" association="A_midMarker_markedElement">
+        <ownedComment xmi:id="MarkedElement-midMarker-_ownedComment.0" annotatedElement="MarkedElement-midMarker">
+          <body>an optional mid marker that aligns with all vertices of the marked element except the first and the last.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdxwPo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="MarkedElement-startMarker" name="startMarker" visibility="public" type="Marker" association="A_startMarker_markedElement">
+        <ownedComment xmi:id="MarkedElement-startMarker-_ownedComment.0" annotatedElement="MarkedElement-startMarker">
+          <body>an optional start marker that aligns with the first vertex of the marked element.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pdxwfo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Marker" name="Marker">
+      <ownedComment xmi:id="Marker-_ownedComment.0" annotatedElement="Marker">
+        <body>Marker is a kind of group that is used as a decoration (e.g. an arrowhead) for the vertices of a marked graphical element.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcL_o2EeOw_Nx9vOEGaA" general="Group"/>
+      <ownedAttribute xmi:id="Marker-size" name="size" visibility="public">
+        <ownedComment xmi:id="Marker-size-_ownedComment.0" annotatedElement="Marker-size">
+          <body>the size of the marker</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Dimension"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Marker-reference" name="reference" visibility="public">
+        <ownedComment xmi:id="Marker-reference-_ownedComment.0" annotatedElement="Marker-reference">
+          <body>a point within the bounds of the marker that aligns exactly with the marked element's vertex.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Matrix" name="Matrix">
+      <ownedComment xmi:id="Matrix-_ownedComment.0" annotatedElement="Matrix">
+        <body>Matrix is a kind of transform that represents any transform operation with a 3x3 transformation matrix.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcMPo2EeOw_Nx9vOEGaA" general="Transform"/>
+      <ownedAttribute xmi:id="Matrix-a" name="a" visibility="public">
+        <ownedComment xmi:id="Matrix-a-_ownedComment.0" annotatedElement="Matrix-a">
+          <body>the a value of the transform matrix.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Matrix-b" name="b" visibility="public">
+        <ownedComment xmi:id="Matrix-b-_ownedComment.0" annotatedElement="Matrix-b">
+          <body>the b value of the transform matrix.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Matrix-c" name="c" visibility="public">
+        <ownedComment xmi:id="Matrix-c-_ownedComment.0" annotatedElement="Matrix-c">
+          <body>the c value of the transform matrix.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Matrix-d" name="d" visibility="public">
+        <ownedComment xmi:id="Matrix-d-_ownedComment.0" annotatedElement="Matrix-d">
+          <body>the d value of the transform matrix.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Matrix-e" name="e" visibility="public">
+        <ownedComment xmi:id="Matrix-e-_ownedComment.0" annotatedElement="Matrix-e">
+          <body>the e value of the transform matrix.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Matrix-f" name="f" visibility="public">
+        <ownedComment xmi:id="Matrix-f-_ownedComment.0" annotatedElement="Matrix-f">
+          <body>the f value of the transform matrix.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="MoveTo" name="MoveTo">
+      <ownedComment xmi:id="MoveTo-_ownedComment.0" annotatedElement="MoveTo">
+        <body>MoveTo is a kind of path command that establishes a new current point in the coordinate system.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcMfo2EeOw_Nx9vOEGaA" general="PathCommand"/>
+      <ownedAttribute xmi:id="MoveTo-point" name="point" visibility="public">
+        <ownedComment xmi:id="MoveTo-point-_ownedComment.0" annotatedElement="MoveTo-point">
+          <body>a point to move to in the coordinate system</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_wz9hsM2cEeOtK5GsJlm5Mw" name="Paint">
+      <ownedComment xmi:id="_C_Q0gM2dEeOtK5GsJlm5Mw">
+        <body>Paint is used to fill or stroke a graphical element.</body>
+      </ownedComment>
+      <ownedRule xmi:id="_R3fe8Oh2EeO6TvQHODg78w" name="referenced_paint_server_has_id" constrainedElement="_wz9hsM2cEeOtK5GsJlm5Mw">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R3fe8eh2EeO6TvQHODg78w">
+          <language>OCL</language>
+          <body>paintServer->notEmpty() implies paintServer.id->notEmpty()</body>
+        </specification>
+      </ownedRule>
+      <ownedAttribute xmi:id="_Mg5i0M2dEeOtK5GsJlm5Mw" name="color" visibility="public">
+        <ownedComment xmi:id="_Mg5i0c2dEeOtK5GsJlm5Mw" annotatedElement="_Mg5i0M2dEeOtK5GsJlm5Mw">
+          <body>A solid color to use in painting.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Color"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pdxwvo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_dR8eIM2dEeOtK5GsJlm5Mw" name="paintServer" visibility="public" type="Fill" association="_VGk7AM2kEeOtK5GsJlm5Mw">
+        <ownedComment xmi:id="_dR8eIc2dEeOtK5GsJlm5Mw" annotatedElement="_dR8eIM2dEeOtK5GsJlm5Mw">
+          <body>A paint server that is used in painting.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pdxw_o2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Fill" name="PaintServer" isAbstract="true">
+      <ownedComment xmi:id="Fill-_ownedComment.0" annotatedElement="Fill">
+        <body>PaintServer is the abstract super class of all paint servers, like gradients and patterns</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcMvo2EeOw_Nx9vOEGaA" general="_CwockM6jEeOqlr8E3pzO9g"/>
+      <ownedAttribute xmi:id="Fill-transform" name="transform" visibility="public" type="Transform" isOrdered="true" aggregation="composite" association="_oEGFIM55EeOqlr8E3pzO9g">
+        <ownedComment xmi:id="Fill-transform-_ownedComment.0" annotatedElement="Fill-transform">
+          <body>A set of transforms that apply to this paint server.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PdxxPo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pdxxfo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Path" name="Path">
+      <ownedComment xmi:id="Path-_ownedComment.0" annotatedElement="Path">
+        <body>Path is a marked element that defines a custom shape whose geometry is specified with a sequence of path commands.</body>
+      </ownedComment>
+      <ownedRule xmi:id="_uJDzUOjHEeO6TvQHODg78w" name="first_command_must_be_move" constrainedElement="Path">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Omo48OjIEeO6TvQHODg78w">
+          <language>OCL</language>
+          <body>command->first().oclIsKindOf(MoveTo)</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:id="_2PhcM_o2EeOw_Nx9vOEGaA" general="MarkedElement"/>
+      <ownedAttribute xmi:id="Path-command" name="command" visibility="public" type="PathCommand" isOrdered="true" aggregation="composite" association="_-INckM55EeOqlr8E3pzO9g">
+        <ownedComment xmi:id="Path-command-_ownedComment.0" annotatedElement="Path-command">
+          <body>a list of path commands that define the geometry of the custom shape.</body>
+        </ownedComment>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pdxxvo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="PathCommand" name="PathCommand" isAbstract="true">
+      <ownedComment xmi:id="PathCommand-_ownedComment.0" annotatedElement="PathCommand">
+        <body>PathCommand is the abstract super type of all commands that participate in specifying a path element.</body>
+      </ownedComment>
+      <ownedAttribute xmi:id="PathCommand-isRelative" name="isRelative" visibility="public">
+        <ownedComment xmi:id="PathCommand-isRelative-_ownedComment.0" annotatedElement="PathCommand-isRelative">
+          <body>whether the coordinates specified by the command are relative to the current point (when true) or to the origin point of the coordinate system (when false).</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_2Pdxx_o2EeOw_Nx9vOEGaA" value="false"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Pattern" name="Pattern">
+      <ownedComment xmi:id="Pattern-_ownedComment.0" annotatedElement="Pattern">
+        <body>Pattern is a kind of paint server that paints a graphical element (a tile) repeatedly at fixed intervals in x and y axes to cover the areas to be filled.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcNPo2EeOw_Nx9vOEGaA" general="Fill"/>
+      <ownedAttribute xmi:id="Pattern-bounds" name="bounds" visibility="public">
+        <ownedComment xmi:id="Pattern-bounds-_ownedComment.0" annotatedElement="Pattern-bounds">
+          <body>the bounds of the pattern that define a private coordinate system for the pattern's tile.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Pattern-tile" name="tile" visibility="public" type="GraphicalElement" aggregation="composite" association="A_tile_pattern">
+        <ownedComment xmi:id="Pattern-tile-_ownedComment.0" annotatedElement="Pattern-tile">
+          <body>a reference to a graphical element, owned by the pattern, that works as a tile to be painted repeatedly at a fixed interval to fill an closed area.</body>
+        </ownedComment>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Polygon" name="Polygon">
+      <ownedComment xmi:id="Polygon-_ownedComment.0" annotatedElement="Polygon">
+        <body>Polygon is a marked element that defines a closed shape consisting of a sequence of connected straight line segments.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcNfo2EeOw_Nx9vOEGaA" general="MarkedElement"/>
+      <ownedAttribute xmi:id="Polygon-point" name="point" visibility="public" isOrdered="true">
+        <ownedComment xmi:id="Polygon-point-_ownedComment.0" annotatedElement="Polygon-point">
+          <body>a list of 3 or more points making up the polygon.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PeY0Po2EeOw_Nx9vOEGaA" value="3"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PeY0fo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Polyline" name="Polyline">
+      <ownedComment xmi:id="Polyline-_ownedComment.0" annotatedElement="Polyline">
+        <body>Polyline is a marked element that defines a shape consisting of a sequence of connected straight line segments.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcNvo2EeOw_Nx9vOEGaA" general="MarkedElement"/>
+      <ownedAttribute xmi:id="Polyline-point" name="point" visibility="public" isOrdered="true">
+        <ownedComment xmi:id="Polyline-point-_ownedComment.0" annotatedElement="Polyline-point">
+          <body>a list of 2 or more points making up the polyline.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PeY0vo2EeOw_Nx9vOEGaA" value="2"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PeY0_o2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="QuadraticCurveTo" name="QuadraticCurveTo">
+      <ownedComment xmi:id="QuadraticCurveTo-_ownedComment.0" annotatedElement="CubicCurveTo QuadraticCurveTo">
+        <body>QuadraticCurveTo is a kind of path command that draws a quadratic bézier curve from the current point to a new point using a single control point.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PhcN_o2EeOw_Nx9vOEGaA" general="PathCommand"/>
+      <ownedAttribute xmi:id="QuadraticCurveTo-control" name="control" visibility="public">
+        <ownedComment xmi:id="QuadraticCurveTo-control-_ownedComment.0" annotatedElement="QuadraticCurveTo-control">
+          <body>the control point of the quadratic bézier curve.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="QuadraticCurveTo-point" name="point" visibility="public">
+        <ownedComment xmi:id="QuadraticCurveTo-point-_ownedComment.0" annotatedElement="QuadraticCurveTo-point">
+          <body>a point to draw a quadratic bézier curve to from the current point in the coordinate system.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="RadialGradient" name="RadialGradient">
+      <ownedComment xmi:id="RadialGradient-_ownedComment.0" annotatedElement="RadialGradient">
+        <body>RadialGradient is a kind of gradient that fills a graphical element by smoothly changing color values in a circle.</body>
+      </ownedComment>
+      <ownedRule xmi:id="RadialGradient-valid_center_point" name="valid_center_point" constrainedElement="RadialGradient">
+        <ownedComment xmi:id="RadialGradient-valid_center_point-_ownedComment.0" annotatedElement="RadialGradient-valid_center_point">
+          <body>the center point coordinates must be between 0 and 1</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="RadialGradient-valid_center_point-_specification">
+          <language>OCL</language>
+          <body>centerX>=0 and centerX&lt;=1 and centerY>=0 and centerY&lt;=1</body>
+        </specification>
+      </ownedRule>
+      <ownedRule xmi:id="RadialGradient-valid_focus_point" name="valid_focus_point" constrainedElement="RadialGradient">
+        <ownedComment xmi:id="RadialGradient-valid_focus_point-_ownedComment.0" annotatedElement="RadialGradient-valid_focus_point">
+          <body>the focus point coordinates must be between 0 and 1</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="RadialGradient-valid_focus_point-_specification">
+          <language>OCL</language>
+          <body>focusX>=0 and focusX&lt;=1 and focusY>=0 and focusY&lt;=1</body>
+        </specification>
+      </ownedRule>
+      <ownedRule xmi:id="RadialGradient-valid_radius" name="valid_radius" constrainedElement="RadialGradient">
+        <ownedComment xmi:id="RadialGradient-valid_radius-_ownedComment.0" annotatedElement="RadialGradient-valid_radius">
+          <body>the radius  must be between 0 and 1</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="RadialGradient-valid_radius-_specification">
+          <language>OCL</language>
+          <body>radius>=0 and radius&lt;=1</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:id="_2PiDMPo2EeOw_Nx9vOEGaA" general="Gradient"/>
+      <ownedAttribute xmi:id="_u_spINpdEeOltvy1wTDHDA" name="center" visibility="public">
+        <ownedComment xmi:id="_u_spIdpdEeOltvy1wTDHDA" annotatedElement="_u_spINpdEeOltvy1wTDHDA">
+          <body>a center point for the radial gradient expressed as a percentage along the x and y axes.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_0SIMENpdEeOltvy1wTDHDA" name="focus" visibility="public">
+        <ownedComment xmi:id="_0SIMEdpdEeOltvy1wTDHDA" annotatedElement="_0SIMENpdEeOltvy1wTDHDA">
+          <body>a focus point for the radial gradient expressed as a percentage along the x and y axes.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="RadialGradient-radius" name="radius" visibility="public">
+        <ownedComment xmi:id="RadialGradient-radius-_ownedComment.0" annotatedElement="RadialGradient-radius">
+          <body>a real number (>=0 and >=1) representing a ratio of the graphical element's size that is the radius of the gradient.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_2PeY1Po2EeOw_Nx9vOEGaA" value="0.5"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Rectangle" name="Rectangle">
+      <ownedComment xmi:id="Rectangle-_ownedComment.0" annotatedElement="Rectangle">
+        <body>Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius.</body>
+      </ownedComment>
+      <ownedRule xmi:id="_qFi4AOhuEeO6TvQHODg78w" name="non_negative_corner_radius" constrainedElement="Rectangle">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_qFi4AehuEeO6TvQHODg78w">
+          <language>OCL</language>
+          <body>cornerRadius >= 0</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:id="_2PiDMfo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:id="Rectangle-bounds" name="bounds" visibility="public">
+        <ownedComment xmi:id="Rectangle-bounds-_ownedComment.0" annotatedElement="Rectangle-bounds">
+          <body>the bounds of the rectangle in the x-y coordinate system.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Rectangle-cornerRadius" name="cornerRadius" visibility="public">
+        <ownedComment xmi:id="Rectangle-cornerRadius-_ownedComment.0" annotatedElement="Rectangle-cornerRadius">
+          <body>a radius for the rectangle's rounded corners. When the radius is 0, the rectangle is drawn with sharp corners.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PeY1fo2EeOw_Nx9vOEGaA"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_2PeY1vo2EeOw_Nx9vOEGaA" value="0"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_jfIkENesEeOsUY1jE2-lpg" name="RootCanvas">
+      <ownedComment xmi:id="_jfIkEdesEeOsUY1jE2-lpg" annotatedElement="_jfIkENesEeOsUY1jE2-lpg">
+        <body>RootCanvas is a kind of canvas that represents the root of containment for all graphical elements that render together.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PiDMvo2EeOw_Nx9vOEGaA" general="Canvas"/>
+      <ownedAttribute xmi:id="_jfIkE9esEeOsUY1jE2-lpg" name="backgroundColor" visibility="public">
+        <ownedComment xmi:id="_jfIkFNesEeOsUY1jE2-lpg" annotatedElement="_jfIkE9esEeOsUY1jE2-lpg">
+          <body>An optional paint for the background of the canvas.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Color"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_4Po2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_jfIkFtesEeOsUY1jE2-lpg" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" isOrdered="true" aggregation="composite" association="_qUuAwM51EeOqlr8E3pzO9g">
+        <ownedComment xmi:id="_jfIkF9esEeOsUY1jE2-lpg" annotatedElement="_jfIkFtesEeOsUY1jE2-lpg">
+          <body>An optional definitions element to hold objects commonly referenced by the canvas.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_4fo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_jfIkGdesEeOsUY1jE2-lpg" name="externalStyleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" isOrdered="true" association="_VJB6MM41EeOqlr8E3pzO9g">
+        <ownedComment xmi:id="_jfIkGtesEeOsUY1jE2-lpg" annotatedElement="_jfIkGdesEeOsUY1jE2-lpg">
+          <body>A list of external style sheets that are imported by the canvas.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_4vo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pe_4_o2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_V49isA35EeSM9dpvq2CG1g" name="script" visibility="public">
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_WPHY4A35EeSM9dpvq2CG1g"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_WPH_8A35EeSM9dpvq2CG1g" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Rotate" name="Rotate">
+      <ownedComment xmi:id="Rotate-_ownedComment.0" annotatedElement="Rotate">
+        <body>Rotate is a kind of transform that rotates a graphical element by a given angle about a given center point in the x-y coordinate system.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PiDM_o2EeOw_Nx9vOEGaA" general="Transform"/>
+      <ownedAttribute xmi:id="Rotate-angle" name="angle" visibility="public">
+        <ownedComment xmi:id="Rotate-angle-_ownedComment.0" annotatedElement="Rotate-angle">
+          <body>a real number representing the angle (in degrees) of rotation. Both positive (clock-wise) and negative (counter-clock-wise) values are allowed.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Rotate-center" name="center" visibility="public">
+        <ownedComment xmi:id="Rotate-center-_ownedComment.0" annotatedElement="Rotate-center">
+          <body>a point in the x-y coordinate system about which the rotation is performed. If the point is not specified, it is assumed to be the origin of the x-y coordinate system.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_5Po2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Scale" name="Scale">
+      <ownedComment xmi:id="Scale-_ownedComment.0" annotatedElement="Scale">
+        <body>Scale is a kind of transform that scales (resizes) a graphical element by a given factor in the x-y coordinate system.</body>
+      </ownedComment>
+      <ownedRule xmi:id="Scale-non-negative-scale" name="non-negative-scale" constrainedElement="Scale">
+        <ownedComment xmi:id="Scale-non-negative-scale-_ownedComment.0" annotatedElement="Scale-non-negative-scale">
+          <body>scale factors cannot be negative.</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="Scale-non-negative-scale-_specification">
+          <language>OCL</language>
+          <body>factorX>=0 and factorY>=0</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:id="_2PiDNPo2EeOw_Nx9vOEGaA" general="Transform"/>
+      <ownedAttribute xmi:id="Scale-factorX" name="factorX" visibility="public">
+        <ownedComment xmi:id="Scale-factorX-_ownedComment.0" annotatedElement="Scale-factorX">
+          <body>a real number (>=0) representing a scale factor along the x-axis.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Scale-factorY" name="factorY" visibility="public">
+        <ownedComment xmi:id="Scale-factorY-_ownedComment.0" annotatedElement="Scale-factorY">
+          <body>a real number(>=0) representing a scale factor along the y-axis.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Skew" name="Skew">
+      <ownedComment xmi:id="Skew-_ownedComment.0" annotatedElement="Skew">
+        <body>Skew is a kind of transform that skews (deforms) a graphical element by given angles in the x-y coordinate system.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PiDNfo2EeOw_Nx9vOEGaA" general="Transform"/>
+      <ownedAttribute xmi:id="Skew-angleX" name="angleX" visibility="public">
+        <ownedComment xmi:id="Skew-angleX-_ownedComment.0" annotatedElement="Skew-angleX">
+          <body>a real number representing the angle (in degrees) of skew along the x-axis. Both positive (clock-wise) and negative (counter-clock-wise) values are allowed.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Skew-angleY" name="angleY" visibility="public">
+        <ownedComment xmi:id="Skew-angleY-_ownedComment.0" annotatedElement="Skew-angleY">
+          <body>a real number representing the angle (in degrees) of skew along the y-axis. Both positive (clock-wise) and negative (counter-clock-wise) values are allowed.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Style" name="Style">
+      <ownedComment xmi:id="Style-_ownedComment.0" annotatedElement="Style">
+        <body>Style contains formatting properties that affect the appearance or style of graphical elements.</body>
+      </ownedComment>
+      <ownedRule xmi:id="Style-valid_font_size" name="valid_font_size">
+        <ownedComment xmi:id="Style-valid_font_size-_ownedComment.0" annotatedElement="Style-valid_font_size">
+          <body>the font size is non-negative</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_font_size-_specification">
+          <language>OCL</language>
+          <body>fontSize >=  0</body>
+        </specification>
+      </ownedRule>
+      <ownedRule xmi:id="Style-valid_fill_opacity" name="valid_fill_opacity">
+        <ownedComment xmi:id="Style-valid_fill_opacity-_ownedComment.0" annotatedElement="Style-valid_fill_opacity">
+          <body>the stroke width is non-negative</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_fill_opacity-_specification">
+          <language>OCL</language>
+          <body>fillOpacity >=  0 and fillOpacity &lt;=1</body>
+        </specification>
+      </ownedRule>
+      <ownedRule xmi:id="Style-valid_stroke_width" name="valid_stroke_width">
+        <ownedComment xmi:id="Style-valid_stroke_width-_ownedComment.0" annotatedElement="Style-valid_stroke_width">
+          <body>the stroke width is non-negative</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_stroke_width-_specification">
+          <language>OCL</language>
+          <body>strokeWidth >=  0</body>
+        </specification>
+      </ownedRule>
+      <ownedRule xmi:id="Style-valid_dash_length_size" name="valid_dash_length_size">
+        <ownedComment xmi:id="Style-valid_dash_length_size-_ownedComment.0" annotatedElement="Style-valid_dash_length_size">
+          <body>the size of the stroke dash length list must be even.</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_dash_length_size-_specification">
+          <language>OCL</language>
+          <body>strokeDashLength->size().mod(2) = 0</body>
+        </specification>
+      </ownedRule>
+      <ownedRule xmi:id="Style-valid_stroke_opacity" name="valid_stroke_opacity">
+        <ownedComment xmi:id="Style-valid_stroke_opacity-_ownedComment.0" annotatedElement="Style-valid_stroke_opacity">
+          <body>the opacity of the fill is non-negative</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="Style-valid_stroke_opacity-_specification">
+          <language>OCL</language>
+          <body>strokeOpacity >=  0 and strokeOpacity &lt;=1</body>
+        </specification>
+      </ownedRule>
+      <ownedAttribute xmi:id="Style-fill" name="fill" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" aggregation="composite" association="A_fill_style">
+        <ownedComment xmi:id="Style-fill-_ownedComment.0" annotatedElement="Style-fill">
+          <body>A paint that is used to fill the enclosed regions of a graphical element. The default is a black paint.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_5fo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Style-fillOpacity" name="fillOpacity" visibility="public">
+        <ownedComment xmi:id="Style-fillOpacity-_ownedComment.0" annotatedElement="Style-fillOpacity">
+          <body>A real number (>=0 and &lt;=1) representing the opacity of the fill used to paint a graphical element. A value of 0 means totally transparent, while a value of 1 means totally opaque. The default is 1.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_5vo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_KemS4M2oEeOtK5GsJlm5Mw" name="stroke" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" aggregation="composite" association="_KeO_IM2rEeOtK5GsJlm5Mw">
+        <ownedComment xmi:id="_KemS4c2oEeOtK5GsJlm5Mw" annotatedElement="_KemS4M2oEeOtK5GsJlm5Mw">
+          <body>A paint that is used to stroke a graphical element. The default is no paint.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_5_o2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Style-strokeWidth" name="strokeWidth" visibility="public">
+        <ownedComment xmi:id="Style-strokeWidth-_ownedComment.0" annotatedElement="Style-strokeWidth">
+          <body>A real number (>=0) representing the width of the stroke of a graphical element. A value of 0 specifies no stroke is painted. The default is 1.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pe_6Po2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Style-strokeOpacity" name="strokeOpacity" visibility="public">
+        <ownedComment xmi:id="Style-strokeOpacity-_ownedComment.0" annotatedElement="Style-strokeOpacity">
+          <body>A real number (>=0 and &lt;=1) representing the opacity of the stroke of a graphical element. A value of 0 means totally transparent, while a value of 1 means totally opaque. The default is 1.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm8Po2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Style-strokeDashLength" name="strokeDashLength" visibility="public" isOrdered="true" isUnique="false">
+        <ownedComment xmi:id="Style-strokeDashLength-_ownedComment.0" annotatedElement="Style-strokeDashLength">
+          <body>A list of real numbers specifying a pattern of alternating dash and gap lengths used in stroking the outline of a graphical element with the first one specifying a dash length. The size of the list is expected to be even. If the list is empty, the stroke is drawn solid. The default is empty list.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm8fo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pfm8vo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Style-fontSize" name="fontSize" visibility="public">
+        <ownedComment xmi:id="Style-fontSize-_ownedComment.0" annotatedElement="Style-fontSize">
+          <body>A real number (>=0) representing the size (in unit of length) of the font used to render a text element. The default is 10.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm8_o2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Style-fontName" name="fontName" visibility="public">
+        <ownedComment xmi:id="Style-fontName-_ownedComment.0" annotatedElement="Style-fontName">
+          <body>The name of the font used to render a text element (e.g. &quot;Times New Roman&quot;, &quot;Arial&quot; or &quot;Helvetica&quot;). The default is &quot;Arial&quot;.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm9Po2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Style-fontItalic" name="fontItalic" visibility="public">
+        <ownedComment xmi:id="Style-fontItalic-_ownedComment.0" annotatedElement="Style-fontItalic">
+          <body>Whether the font used to render a text element has an italic style. The default is false.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm9fo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Style-fontBold" name="fontBold" visibility="public">
+        <ownedComment xmi:id="Style-fontBold-_ownedComment.0" annotatedElement="Style-fontBold">
+          <body>Whether the font used to render a text element has a bold style. The default is false.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Boolean"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm9vo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Style-fontStrikeThrough" name="fontDecoration" visibility="public" type="_wgzj4M2WEeOtK5GsJlm5Mw">
+        <ownedComment xmi:id="Style-fontStrikeThrough-_ownedComment.0" annotatedElement="Style-fontStrikeThrough">
+          <body>The decoration of the font used to render a text element. The default is no decoration.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm9_o2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_9z_BQM2CEeOX1ohrWoozJQ" name="StyleRule">
+      <ownedComment xmi:id="_XHdkwM2QEeOtK5GsJlm5Mw">
+        <body>StyleRule selects a set of graphical elements and applies a style to them.</body>
+      </ownedComment>
+      <ownedAttribute xmi:id="_2CcQMM2FEeOX1ohrWoozJQ" name="selector" visibility="public" type="_ClirwM2DEeOX1ohrWoozJQ" isOrdered="true" aggregation="composite" association="_OTgnYM2GEeOX1ohrWoozJQ">
+        <ownedComment xmi:id="_2CcQMc2FEeOX1ohrWoozJQ" annotatedElement="_2CcQMM2FEeOX1ohrWoozJQ">
+          <body>A set of selectors for graphical elements to apply the rule to.</body>
+        </ownedComment>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pfm-Po2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_DFi6IM2GEeOX1ohrWoozJQ" name="style" visibility="public" type="Style" aggregation="composite" association="_vnz5oM2GEeOX1ohrWoozJQ">
+        <ownedComment xmi:id="_DFi6Ic2GEeOX1ohrWoozJQ" annotatedElement="_DFi6IM2GEeOX1ohrWoozJQ">
+          <body>A style that is applied to graphical elements selected by this rule.</body>
+        </ownedComment>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_ClirwM2DEeOX1ohrWoozJQ" name="StyleSelector">
+      <ownedComment xmi:id="_FfB5AM2REeOtK5GsJlm5Mw">
+        <body>StyleSelector defines criteria that matches a set of graphical elements.</body>
+      </ownedComment>
+      <ownedAttribute xmi:id="_OsgrUM2IEeOX1ohrWoozJQ" name="kind" visibility="public" type="_6aYm0OgeEeO6TvQHODg78w">
+        <ownedComment xmi:id="_OsgrUc2IEeOX1ohrWoozJQ" annotatedElement="_OsgrUM2IEeOX1ohrWoozJQ">
+          <body>The kind of graphical element to select.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm-fo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_Y03bYM2IEeOX1ohrWoozJQ" name="class" visibility="public" isOrdered="true">
+        <ownedComment xmi:id="_Y03bYc2IEeOX1ohrWoozJQ" annotatedElement="_Y03bYM2IEeOX1ohrWoozJQ">
+          <body>A set of strings representing classes of graphical elements to select. Selected elements must have all those classes.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm-vo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pfm-_o2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_4ytfwM2CEeOX1ohrWoozJQ" name="StyleSheet">
+      <ownedComment xmi:id="_WuWzIM2OEeOtK5GsJlm5Mw">
+        <body>StyleSheet defines a list of style rules that apply to graphical elements in a canvas.</body>
+      </ownedComment>
+      <ownedAttribute xmi:id="_TqPtcM2EEeOX1ohrWoozJQ" name="rule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" isOrdered="true" aggregation="composite" association="_QZkcUM2DEeOX1ohrWoozJQ">
+        <ownedComment xmi:id="_TqPtcc2EEeOX1ohrWoozJQ" annotatedElement="_TqPtcM2EEeOX1ohrWoozJQ">
+          <body>A list of style rules that apply to graphical elements.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pfm_Po2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pfm_fo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Text" name="Text">
+      <ownedComment xmi:id="Text-_ownedComment.0" annotatedElement="Text">
+        <body>Text is a graphical element that defines a shape that renders a character string at a given position.</body>
+      </ownedComment>
+      <ownedRule xmi:id="_dPn0oO0zEeOCPtJ2AfZp5A" name="data_cannot_be_empty" constrainedElement="Text">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_dPn0oe0zEeOCPtJ2AfZp5A">
+          <language>OCL</language>
+          <body>data->notEmpty() implies data.size() > 0</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:id="_2PiDNvo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:id="Text-data" name="data" visibility="public">
+        <ownedComment xmi:id="Text-data-_ownedComment.0" annotatedElement="Text-data">
+          <body>the text as a string of characters.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Text-bounds" name="position" visibility="public">
+        <ownedComment xmi:id="Text-bounds-_ownedComment.0" annotatedElement="Text-bounds">
+          <body>the bounds inside which the text is rendered (possibly wrapped into multiple lines)</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_gfifwBOfEeSXerk-XJQMGw" name="anchor" type="_E6CjYBOfEeSXerk-XJQMGw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_k-EgkBOfEeSXerk-XJQMGw"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_k-FHoBOfEeSXerk-XJQMGw" value="1"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Transform" name="Transform" isAbstract="true">
+      <ownedComment xmi:id="Transform-_ownedComment.0" annotatedElement="Transform">
+        <body>Transform defines an operation that changes the geometry of a graphical element in a specific way.</body>
+      </ownedComment>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Translate" name="Translate">
+      <ownedComment xmi:id="Translate-_ownedComment.0" annotatedElement="Translate">
+        <body>Translate is a kind of transform that translates (moves) a graphical element by a given delta along the x-y coordinate system.</body>
+      </ownedComment>
+      <generalization xmi:id="_2PiDN_o2EeOw_Nx9vOEGaA" general="Transform"/>
+      <ownedAttribute xmi:id="Translate-deltaX" name="deltaX" visibility="public">
+        <ownedComment xmi:id="Translate-deltaX-_ownedComment.0" annotatedElement="Translate-deltaX">
+          <body>a real number representing a translate delta along the x-axis. Both positive and negative values are allowed.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Translate-deltaY" name="deltaY" visibility="public">
+        <ownedComment xmi:id="Translate-deltaY-_ownedComment.0" annotatedElement="Translate-deltaY">
+          <body>a real number representing a translate delta along the y-axis. Both positive and negative values are allowed.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_wGwIsNeoEeOgmPOh7kSfHA" name="Use">
+      <ownedComment xmi:id="_wGwIsdeoEeOgmPOh7kSfHA" annotatedElement="_wGwIsNeoEeOgmPOh7kSfHA">
+        <body>Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius.</body>
+      </ownedComment>
+      <ownedRule xmi:id="_oxx7UOh0EeO6TvQHODg78w" name="referenced_element_has_id" constrainedElement="_wGwIsNeoEeOgmPOh7kSfHA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_oxx7Ueh0EeO6TvQHODg78w">
+          <language>OCL</language>
+          <body>referencedElement->notEmpty() implies referencedElement.id->notEmpty()</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:id="_2PiDOPo2EeOw_Nx9vOEGaA" general="GraphicalElement"/>
+      <ownedAttribute xmi:id="_wGwIs9eoEeOgmPOh7kSfHA" name="bounds" visibility="public">
+        <ownedComment xmi:id="_wGwItNeoEeOgmPOh7kSfHA" annotatedElement="_wGwIs9eoEeOgmPOh7kSfHA">
+          <body>the bounds of the rectangle in the x-y coordinate system.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PgOAPo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="_im5DIOHhEeO71tdCkM4EDw" name="referencedElement" visibility="public" type="GraphicalElement" isOrdered="true" association="_zbtccOHnEeO71tdCkM4EDw">
+        <ownedComment xmi:id="_im5DIeHhEeO71tdCkM4EDw" annotatedElement="_im5DIOHhEeO71tdCkM4EDw">
+          <body>A list of graphical elements that are members of this group.</body>
+        </ownedComment>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_wgzj4M2WEeOtK5GsJlm5Mw" name="FontDecoration">
+      <ownedComment xmi:id="_2Xj74M2WEeOtK5GsJlm5Mw">
+        <body>The kind of decoration applied to a font.</body>
+      </ownedComment>
+      <ownedLiteral xmi:id="_BWypkM2XEeOtK5GsJlm5Mw" name="underline">
+        <ownedComment xmi:id="_EPxo4M2XEeOtK5GsJlm5Mw">
+          <body>The font is underlined.</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_G7EKcM2XEeOtK5GsJlm5Mw" name="overline">
+        <ownedComment xmi:id="_G7EKcc2XEeOtK5GsJlm5Mw">
+          <body>The font is overlined.</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_HEvq4M2XEeOtK5GsJlm5Mw" name="lineThrough">
+        <ownedComment xmi:id="_HEvq4c2XEeOtK5GsJlm5Mw">
+          <body>The font is striked through.</body>
+        </ownedComment>
+      </ownedLiteral>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_6aYm0OgeEeO6TvQHODg78w" name="ElementKind">
+      <ownedComment xmi:id="_6aYm0egeEeO6TvQHODg78w">
+        <body>The kind of graphical element.</body>
+      </ownedComment>
+      <ownedLiteral xmi:id="_6aYm0ugeEeO6TvQHODg78w" name="canvas">
+        <ownedComment xmi:id="_6aYm0-geEeO6TvQHODg78w">
+          <body>The Canvas element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_TObvQOgfEeO6TvQHODg78w" name="circle">
+        <ownedComment xmi:id="_TObvQegfEeO6TvQHODg78w">
+          <body>The Circle element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_XmBakOgfEeO6TvQHODg78w" name="clipPath">
+        <ownedComment xmi:id="_XmBakegfEeO6TvQHODg78w">
+          <body>The ClipPath element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_iEuOEOgfEeO6TvQHODg78w" name="ellipse">
+        <ownedComment xmi:id="_iEuOEegfEeO6TvQHODg78w">
+          <body>The Ellipse element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_nqm4gOgfEeO6TvQHODg78w" name="group">
+        <ownedComment xmi:id="_nqm4gegfEeO6TvQHODg78w">
+          <body>The Group element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_n3HqgOgfEeO6TvQHODg78w" name="image">
+        <ownedComment xmi:id="_n3IRkOgfEeO6TvQHODg78w">
+          <body>The Image element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_n9h0gOgfEeO6TvQHODg78w" name="line">
+        <ownedComment xmi:id="_n9h0gegfEeO6TvQHODg78w">
+          <body>The Line element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_oEA3AOgfEeO6TvQHODg78w" name="marker">
+        <ownedComment xmi:id="_oEA3AegfEeO6TvQHODg78w">
+          <body>The Marker element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_oJbigOgfEeO6TvQHODg78w" name="path">
+        <ownedComment xmi:id="_oJbigegfEeO6TvQHODg78w">
+          <body>The Path element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_oO2OAOgfEeO6TvQHODg78w" name="polygon">
+        <ownedComment xmi:id="_oO2OAegfEeO6TvQHODg78w">
+          <body>The Polygon element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_oXUNgOgfEeO6TvQHODg78w" name="polyline">
+        <ownedComment xmi:id="_oXUNgegfEeO6TvQHODg78w">
+          <body>The Polyline element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_ofLJAOgfEeO6TvQHODg78w" name="rectangle">
+        <ownedComment xmi:id="_ofLJAegfEeO6TvQHODg78w">
+          <body>The Rectangle element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_oluc8OgfEeO6TvQHODg78w" name="text">
+        <ownedComment xmi:id="_oluc8egfEeO6TvQHODg78w">
+          <body>The Text element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+      <ownedLiteral xmi:id="_oz2_kOgfEeO6TvQHODg78w" name="use">
+        <ownedComment xmi:id="_oz2_kegfEeO6TvQHODg78w">
+          <body>The Use element kind</body>
+        </ownedComment>
+      </ownedLiteral>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_E6CjYBOfEeSXerk-XJQMGw" name="TextAnchor">
+      <ownedLiteral xmi:id="_Gog3YBOfEeSXerk-XJQMGw" name="start"/>
+      <ownedLiteral xmi:id="_NUm78BOfEeSXerk-XJQMGw" name="middle"/>
+      <ownedLiteral xmi:id="_N_-0MBOfEeSXerk-XJQMGw" name="end"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_qUuAwM51EeOqlr8E3pzO9g" name="A_definitions_canvas" memberEnd="_jfIkFtesEeOsUY1jE2-lpg _qUuAwc51EeOqlr8E3pzO9g">
+      <ownedEnd xmi:id="_qUuAwc51EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" association="_qUuAwM51EeOqlr8E3pzO9g"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_VJB6MM41EeOqlr8E3pzO9g" name="A_externalStyleSheet_canvas" memberEnd="_jfIkGdesEeOsUY1jE2-lpg _VJB6Mc41EeOqlr8E3pzO9g">
+      <ownedEnd xmi:id="_VJB6Mc41EeOqlr8E3pzO9g" name="canvas" visibility="public" type="_jfIkENesEeOsUY1jE2-lpg" association="_VJB6MM41EeOqlr8E3pzO9g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PgOAfo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PgOAvo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_Nti6EM53EeOqlr8E3pzO9g" name="A_definition_definitions" memberEnd="_zSdxIM5wEeOqlr8E3pzO9g _Nti6Ec53EeOqlr8E3pzO9g">
+      <ownedEnd xmi:id="_Nti6Ec53EeOqlr8E3pzO9g" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" association="_Nti6EM53EeOqlr8E3pzO9g"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_packagedElement.47" name="A_styleSheet_definitions" memberEnd="Canvas-packagedStyle _packagedElement.47-canvas">
+      <ownedEnd xmi:id="_packagedElement.47-canvas" name="definitions" visibility="public" type="_DH0DwM5yEeOqlr8E3pzO9g" association="_packagedElement.47"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_clipPath_clippedElement" name="A_clipPath_clippedElement" memberEnd="GraphicalElement-clipPath ClipPath-clippedElement">
+      <ownedEnd xmi:id="ClipPath-clippedElement" name="clippedElement" visibility="public" type="GraphicalElement" association="A_clipPath_clippedElement">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PgOA_o2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2PgOBPo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_localStyle_styledElement" name="A_style_styledElement" memberEnd="GraphicalElement-localStyle A_localStyle_styledElement-styledElement">
+      <ownedEnd xmi:id="A_localStyle_styledElement-styledElement" name="styledElement" visibility="public" type="GraphicalElement" association="A_localStyle_styledElement">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2PgOBfo2EeOw_Nx9vOEGaA"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_TVnmYM42EeOqlr8E3pzO9g" name="A_transform_transformedElement" memberEnd="GraphicalElement-transform _TVnmYc42EeOqlr8E3pzO9g">
+      <ownedEnd xmi:id="_TVnmYc42EeOqlr8E3pzO9g" name="transformedElement" visibility="public" type="GraphicalElement" association="_TVnmYM42EeOqlr8E3pzO9g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1EPo2EeOw_Nx9vOEGaA"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_hQOVgM41EeOqlr8E3pzO9g" name="A_stop_gradient" memberEnd="Gradient-stop _hQO8kM41EeOqlr8E3pzO9g">
+      <ownedEnd xmi:id="_hQO8kM41EeOqlr8E3pzO9g" name="gradient" visibility="public" type="Gradient" association="_hQOVgM41EeOqlr8E3pzO9g"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_member_group" name="A_member_group" memberEnd="Group-member GraphicalElement-group"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_endMarker_markedElement" name="A_endMarker_markedElement" memberEnd="MarkedElement-endMarker A_endMarker_markedElement-markedElement">
+      <ownedEnd xmi:id="A_endMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_endMarker_markedElement">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Efo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1Evo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_midMarker_markedElement" name="A_midMarker_markedElement" memberEnd="MarkedElement-midMarker A_midMarker_markedElement-markedElement">
+      <ownedEnd xmi:id="A_midMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_midMarker_markedElement">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1E_o2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1FPo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_startMarker_markedElement" name="A_startMarker_markedElement" memberEnd="MarkedElement-startMarker A_startMarker_markedElement-markedElement">
+      <ownedEnd xmi:id="A_startMarker_markedElement-markedElement" name="markedElement" visibility="public" type="MarkedElement" association="A_startMarker_markedElement">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Ffo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1Fvo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_VGk7AM2kEeOtK5GsJlm5Mw" name="A_paintServer_paint" memberEnd="_dR8eIM2dEeOtK5GsJlm5Mw _VGk7Ac2kEeOtK5GsJlm5Mw">
+      <ownedEnd xmi:id="_VGk7Ac2kEeOtK5GsJlm5Mw" name="paint" visibility="public" type="_wz9hsM2cEeOtK5GsJlm5Mw" association="_VGk7AM2kEeOtK5GsJlm5Mw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1F_o2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1GPo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_oEGFIM55EeOqlr8E3pzO9g" name="A_transform_paintServer" memberEnd="Fill-transform _oEGFIc55EeOqlr8E3pzO9g">
+      <ownedEnd xmi:id="_oEGFIc55EeOqlr8E3pzO9g" name="paintServer" visibility="public" type="Fill" association="_oEGFIM55EeOqlr8E3pzO9g">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Gfo2EeOw_Nx9vOEGaA"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_-INckM55EeOqlr8E3pzO9g" name="A_command_path" memberEnd="Path-command _-INckc55EeOqlr8E3pzO9g">
+      <ownedEnd xmi:id="_-INckc55EeOqlr8E3pzO9g" name="path" visibility="public" type="Path" association="_-INckM55EeOqlr8E3pzO9g"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_tile_pattern" name="A_tile_pattern" memberEnd="Pattern-tile A_tile_pattern-pattern">
+      <ownedEnd xmi:id="A_tile_pattern-pattern" name="pattern" visibility="public" type="Pattern" association="A_tile_pattern">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Gvo2EeOw_Nx9vOEGaA"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_fill_style" name="A_fill_style" memberEnd="Style-fill A_fill_style-style">
+      <ownedEnd xmi:id="A_fill_style-style" name="style" visibility="public" type="Style" association="A_fill_style">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1G_o2EeOw_Nx9vOEGaA"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_KeO_IM2rEeOtK5GsJlm5Mw" name="A_stroke_style" memberEnd="_KemS4M2oEeOtK5GsJlm5Mw _KeO_Ic2rEeOtK5GsJlm5Mw">
+      <ownedEnd xmi:id="_KeO_Ic2rEeOtK5GsJlm5Mw" name="style" visibility="public" type="Style" association="_KeO_IM2rEeOtK5GsJlm5Mw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1HPo2EeOw_Nx9vOEGaA"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_OTgnYM2GEeOX1ohrWoozJQ" name="A_selector_styleRule" memberEnd="_2CcQMM2FEeOX1ohrWoozJQ _OTgnYc2GEeOX1ohrWoozJQ">
+      <ownedEnd xmi:id="_OTgnYc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" association="_OTgnYM2GEeOX1ohrWoozJQ"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_vnz5oM2GEeOX1ohrWoozJQ" name="A_style_styleRule" memberEnd="_DFi6IM2GEeOX1ohrWoozJQ _vnz5oc2GEeOX1ohrWoozJQ">
+      <ownedEnd xmi:id="_vnz5oc2GEeOX1ohrWoozJQ" name="styleRule" visibility="public" type="_9z_BQM2CEeOX1ohrWoozJQ" association="_vnz5oM2GEeOX1ohrWoozJQ">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Hfo2EeOw_Nx9vOEGaA"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_QZkcUM2DEeOX1ohrWoozJQ" name="A_rule_styleSheet" memberEnd="_TqPtcM2EEeOX1ohrWoozJQ _ZfKSYM2EEeOX1ohrWoozJQ">
+      <ownedEnd xmi:id="_ZfKSYM2EEeOX1ohrWoozJQ" name="styleSheet" visibility="public" type="_4ytfwM2CEeOX1ohrWoozJQ" association="_QZkcUM2DEeOX1ohrWoozJQ"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="_zbtccOHnEeO71tdCkM4EDw" name="A_referencedElement_use" memberEnd="_im5DIOHhEeO71tdCkM4EDw _zbtcceHnEeO71tdCkM4EDw">
+      <ownedEnd xmi:id="_zbtcceHnEeO71tdCkM4EDw" name="use" visibility="public" type="_wGwIsNeoEeOgmPOh7kSfHA" association="_zbtccOHnEeO71tdCkM4EDw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_2Pg1Hvo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_2Pg1H_o2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedEnd>
+    </packagedElement>
+    <profileApplication xmi:id="_mgdyEM1vEeOX1ohrWoozJQ">
+      <eAnnotations xmi:id="_mgdyEc1vEeOX1ohrWoozJQ" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
+      </eAnnotations>
+      <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+    </profileApplication>
+    <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+      
+    </xmi:Extension>
+  </uml:Package>
+  <Ecore:EPackage xmi:id="_mhwLgM1vEeOX1ohrWoozJQ" base_Package="_0" packageName="dg" nsPrefix="dg" basePackage="org.eclipse.papyrus.dd" prefix="DG"/>
+  <Ecore:EReference xmi:id="_f0214M2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fill"/>
+  <Ecore:EReference xmi:id="_llTxkM2UEeOtK5GsJlm5Mw" isUnsettable="true"/>
+  <Ecore:EAttribute xmi:id="_rXVakM2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fillOpacity"/>
+  <Ecore:EAttribute xmi:id="_uksHYM2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-strokeWidth"/>
+  <Ecore:EAttribute xmi:id="_xRnnsM2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-strokeOpacity"/>
+  <Ecore:EReference xmi:id="_zsCbsM2UEeOtK5GsJlm5Mw" isUnsettable="true"/>
+  <Ecore:EAttribute xmi:id="_3RPAwM2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-strokeDashLength"/>
+  <Ecore:EAttribute xmi:id="_5MnvYM2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fontSize"/>
+  <Ecore:EAttribute xmi:id="_-LD_UM2UEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fontName"/>
+  <Ecore:EReference xmi:id="_JF5VMM2VEeOtK5GsJlm5Mw" isUnsettable="true"/>
+  <Ecore:EAttribute xmi:id="_Lh6rsM2VEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fontItalic"/>
+  <Ecore:EAttribute xmi:id="_NiNIcM2VEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fontBold"/>
+  <Ecore:EAttribute xmi:id="_PKi_QM2VEeOtK5GsJlm5Mw" isUnsettable="true"/>
+  <Ecore:EAttribute xmi:id="_QsHfsM2VEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="Style-fontStrikeThrough"/>
+  <Ecore:EReference xmi:id="_Kem58M2oEeOtK5GsJlm5Mw" isUnsettable="true" base_Property="_KemS4M2oEeOtK5GsJlm5Mw"/>
+  <Ecore:EAttribute xmi:id="_huN4sNevEeOsUY1jE2-lpg" isUnsettable="true" base_Property="_jfIkE9esEeOsUY1jE2-lpg"/>
+  <Ecore:EAttribute xmi:id="_4NBHoOgvEeO6TvQHODg78w" isUnsettable="true" base_Property="_OsgrUM2IEeOX1ohrWoozJQ"/>
+  <Ecore:EAttribute xmi:id="_Vs_CQOhUEeO6TvQHODg78w" isUnsettable="true" base_Property="GradientStop-offset"/>
+  <Ecore:EAttribute xmi:id="_jGzjEOhUEeO6TvQHODg78w" isUnsettable="true" base_Property="GradientStop-opacity"/>
+  <Ecore:EAttribute xmi:id="__K6HAOhUEeO6TvQHODg78w" isUnsettable="true" base_Property="GradientStop-color"/>
+  <Ecore:EAttribute xmi:id="_dpXEIOhuEeO6TvQHODg78w" isUnsettable="true" base_Property="Rectangle-cornerRadius"/>
+</xmi:XMI>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.cmof b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.cmof
deleted file mode 100644
index 7f9c15d9689..00000000000
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.cmof
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.1" xmlns:xmi="http://schema.omg.org/spec/XMI/2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:cmof="http://schema.omg.org/spec/MOF/2.0/cmof.xml" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA http://schema.omg.org/spec/MOF/2.0/cmof.xml http://www.eclipse.org/uml2/4.0.0/UML">

-  <cmof:Package xmi:id="_0" name="DI" uri="http://www.omg.org/spec/DD/20110901/DI">

-    <ownedComment xmi:type="cmof:Comment" xmi:id="_ownedComment.0" annotatedElement="_0">

-      <body>The Diagram Interchange (DI) package enables interchange of graphical information that language users have control over, such as position of nodes and line routing points. Language specifications specialize elements of DI to define diagram interchange elements for a language.</body>

-    </ownedComment>

-    <packageImport xmi:type="cmof:PackageImport" xmi:id="_packageImport.0" importingNamespace="_0">

-      <importedPackage xmi:type="cmof:Package" href="DC.cmof#_0"/>

-    </packageImport>

-    <ownedMember xmi:type="cmof:Class" xmi:id="DiagramElement" name="DiagramElement" isAbstract="true">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="DiagramElement-_ownedComment.0" annotatedElement="DiagramElement">

-        <body>DiagramElement is the abstract super type of all elements in diagrams, including diagrams themselves. When contained in a diagram, diagram elements are laid out relative to the diagram’s origin.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="DiagramElement-modelElement" name="modelElement" visibility="public" lower="0" isReadOnly="true" isDerived="true" isDerivedUnion="true" association="A_modelElement_diagramElement">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="DiagramElement-modelElement-_ownedComment.0" annotatedElement="DiagramElement-modelElement">

-          <body>a reference to a depicted model element, which can be any MOF-based element</body>

-        </ownedComment>

-        <type xmi:type="cmof:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EObject"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="DiagramElement-owningElement" name="owningElement" visibility="public" type="DiagramElement" lower="0" isReadOnly="true" isDerived="true" isDerivedUnion="true" association="A_ownedElement_owningElement">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="DiagramElement-owningElement-_ownedComment.0" annotatedElement="DiagramElement-owningElement">

-          <body>a reference to the diagram element that directly owns this diagram element.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="DiagramElement-ownedElement" name="ownedElement" visibility="public" type="DiagramElement" lower="0" upper="*" isReadOnly="true" isComposite="true" isDerived="true" isDerivedUnion="true" association="A_ownedElement_owningElement">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="DiagramElement-ownedElement-_ownedComment.0" annotatedElement="DiagramElement-ownedElement">

-          <body>a collection of diagram elements that are directly owned by this diagram element.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="DiagramElement-localStyle" name="localStyle" visibility="public" type="Style" lower="0" isComposite="true" association="A_localStyle_styledElement">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="DiagramElement-localStyle-_ownedComment.0" annotatedElement="DiagramElement-localStyle">

-          <body>a reference to an optional locally-owned style for this diagram element.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="DiagramElement-sharedStyle" name="sharedStyle" visibility="public" type="Style" lower="0" association="A_sharedStyle_styledElement">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="DiagramElement-sharedStyle-_ownedComment.0" annotatedElement="DiagramElement-sharedStyle">

-          <body>a reference to an optional shared style element for this diagram element.</body>

-        </ownedComment>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Edge" name="Edge" isAbstract="true" superClass="DiagramElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Edge-_ownedComment.0" annotatedElement="Edge">

-        <body>Edge is a diagram element that renders as a polyline, connecting a source diagram element to a target diagram element, and is positioned relative to the origin of the diagram.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Edge-source" name="source" visibility="public" type="DiagramElement" isReadOnly="true" isDerived="true" isDerivedUnion="true" association="A_source_sourceEdge">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Edge-source-_ownedComment.0" annotatedElement="Edge-source">

-          <body>the edge's source diagram element, i.e. where the edge starts from.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Edge-target" name="target" visibility="public" type="DiagramElement" isReadOnly="true" isDerived="true" isDerivedUnion="true" association="A_target_targetEdge">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Edge-target-_ownedComment.0" annotatedElement="Edge-target">

-          <body>the edge's target diagram element, i.e. where the edge ends at.</body>

-        </ownedComment>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Edge-waypoint" name="waypoint" visibility="public" isOrdered="true" lower="0" upper="*">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Edge-waypoint-_ownedComment.0" annotatedElement="Edge-waypoint">

-          <body>an optional list of points relative to the origin of the nesting diagram that specifies the connected line segments of the edge</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Point"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Diagram" name="Diagram" isAbstract="true" superClass="Shape">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Diagram-_ownedComment.0" annotatedElement="Diagram">

-        <body>Diagram is an abstract container of a graph of diagram elements. Diagrams are diagram elements with an origin point in the x-y coordinate system. Their elements are laid out relative to their origin point.</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Diagram-name" name="name" visibility="public" default="">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Diagram-name-_ownedComment.0" annotatedElement="Diagram-name">

-          <body>the name of the diagram.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#String"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Diagram-documentation" name="documentation" visibility="public" default="">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Diagram-documentation-_ownedComment.0" annotatedElement="Diagram-documentation">

-          <body>the documentation of the diagram.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#String"/>

-      </ownedAttribute>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Diagram-resolution" name="resolution" visibility="public" default="300">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Diagram-resolution-_ownedComment.0" annotatedElement="Diagram-resolution">

-          <body>the resolution of the diagram expressed in user units per inch.</body>

-        </ownedComment>

-        <type xmi:type="cmof:PrimitiveType" href="DC.cmof#Real"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Shape" name="Shape" isAbstract="true" superClass="DiagramElement">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Shape-_ownedComment.0" annotatedElement="Shape">

-        <body>Shape is a diagram element with given bounds that is laid out relative to the origin of the diagram</body>

-      </ownedComment>

-      <ownedAttribute xmi:type="cmof:Property" xmi:id="Shape-bounds" name="bounds" visibility="public" lower="0">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="Shape-bounds-_ownedComment.0" annotatedElement="Shape-bounds">

-          <body>the optional bounds of the shape relative to the origin of its nesting plane.</body>

-        </ownedComment>

-        <type xmi:type="cmof:DataType" href="DC.cmof#Bounds"/>

-      </ownedAttribute>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Class" xmi:id="Style" name="Style" isAbstract="true">

-      <ownedComment xmi:type="cmof:Comment" xmi:id="Style-_ownedComment.0" annotatedElement="Style">

-        <body>Style contains formatting properties that affect the appearance or style of diagram elements, including diagram themselves.</body>

-      </ownedComment>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_target_targetEdge" name="A_target_targetEdge" memberEnd="Edge-target A_target_targetEdge-targetEdge">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="A_target_targetEdge-targetEdge" name="targetEdge" visibility="public" type="Edge" lower="0" upper="*" isReadOnly="true" isDerived="true" isDerivedUnion="true" owningAssociation="A_target_targetEdge" association="A_target_targetEdge">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="A_target_targetEdge-targetEdge-_ownedComment.0" annotatedElement="A_target_targetEdge-targetEdge">

-          <body>a collection of edges that reference this diagram element as a target.</body>

-        </ownedComment>

-      </ownedEnd>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_source_sourceEdge" name="A_source_sourceEdge" memberEnd="Edge-source A_source_sourceEdge-sourceEdge">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="A_source_sourceEdge-sourceEdge" name="sourceEdge" visibility="public" type="Edge" lower="0" upper="*" isReadOnly="true" isDerived="true" isDerivedUnion="true" owningAssociation="A_source_sourceEdge" association="A_source_sourceEdge">

-        <ownedComment xmi:type="cmof:Comment" xmi:id="A_source_sourceEdge-sourceEdge-_ownedComment.0" annotatedElement="A_source_sourceEdge-sourceEdge">

-          <body>a collection of edges that reference this diagram element as a source.</body>

-        </ownedComment>

-      </ownedEnd>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_ownedElement_owningElement" name="A_ownedElement_owningElement" memberEnd="DiagramElement-ownedElement DiagramElement-owningElement"/>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_modelElement_diagramElement" name="A_modelElement_diagramElement" memberEnd="DiagramElement-modelElement A_modelElement_diagramElement-diagramElement">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="A_modelElement_diagramElement-diagramElement" name="diagramElement" visibility="public" type="DiagramElement" lower="0" upper="*" isReadOnly="true" isDerived="true" isDerivedUnion="true" owningAssociation="A_modelElement_diagramElement" association="A_modelElement_diagramElement"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_sharedStyle_styledElement" name="A_sharedStyle_styledElement" memberEnd="DiagramElement-sharedStyle A_sharedStyle_styledElement-styledElement">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="A_sharedStyle_styledElement-styledElement" name="styledElement" visibility="public" type="DiagramElement" lower="0" upper="*" owningAssociation="A_sharedStyle_styledElement" association="A_sharedStyle_styledElement"/>

-    </ownedMember>

-    <ownedMember xmi:type="cmof:Association" xmi:id="A_localStyle_styledElement" name="A_localStyle_styledElement" memberEnd="DiagramElement-localStyle A_localStyle_styledElement-styledElement">

-      <ownedEnd xmi:type="cmof:Property" xmi:id="A_localStyle_styledElement-styledElement" name="styledElement" visibility="public" type="DiagramElement" lower="0" owningAssociation="A_localStyle_styledElement" association="A_localStyle_styledElement"/>

-    </ownedMember>

-    <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-      <profileApplication xmi:type="cmof:ProfileApplication" xmi:id="_vpIUIM6KEeOqlr8E3pzO9g" applyingPackage="_0">

-        <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_vpL-gM6KEeOqlr8E3pzO9g" source="http://www.eclipse.org/uml2/2.0.0/UML">

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

-          </eAnnotations>

-        </xmi:Extension>

-        <appliedProfile xmi:type="cmof:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>

-      </profileApplication>

-    </xmi:Extension>

-  </cmof:Package>

-  <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">

-    <Ecore:EPackage xmi:id="_vqpXEM6KEeOqlr8E3pzO9g" base_Package="_0" packageName="di" nsPrefix="di" nsURI="http://www.omg.org/spec/DD/20110901/DI" basePackage="org.eclipse.papyrus.dd" prefix="DI"/>

-  </xmi:Extension>

-  <cmof:Tag xmi:id="_2" name="org.omg.xmi.nsPrefix" value="di" element="_0"/>

-  <cmof:Tag xmi:id="_3" name="org.omg.xmi.nsURI" value="http://www.omg.org/spec/DD/20110901/DI" element="_0"/>

-</xmi:XMI>

diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.di b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.di
new file mode 100644
index 00000000000..c82d27de230
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.di
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList>
+    <availablePage>
+      <emfPageIdentifier href="DI.notation#_orJEkPpLEeOw_Nx9vOEGaA"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="DI.notation#_orJEkPpLEeOw_Nx9vOEGaA"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.ecore b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.ecore
index 22806099bf6..e39ca082388 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.ecore
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.ecore
@@ -8,7 +8,7 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="DiagramElement is the abstract super type of all elements in diagrams, including diagrams themselves. When contained in a diagram, diagram elements are laid out relative to the diagram’s origin."/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="modelElement" ordered="false"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="modelElement" upperBound="-1"
         eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
         changeable="false" volatile="true" transient="true" derived="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -16,33 +16,51 @@
       </eAnnotations>
       <eAnnotations source="union"/>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="owningElement" ordered="false"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="owningDiagramElement" ordered="false"
         eType="#//DiagramElement" changeable="false" volatile="true" transient="true"
-        derived="true" eOpposite="#//DiagramElement/ownedElement">
+        derived="true" eOpposite="#//DiagramElement/ownedDiagramElement">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="a reference to the diagram element that directly owns this diagram element."/>
       </eAnnotations>
       <eAnnotations source="union"/>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedElement" ordered="false"
-        upperBound="-1" eType="#//DiagramElement" changeable="false" volatile="true"
-        transient="true" derived="true" eOpposite="#//DiagramElement/owningElement">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedDiagramElement" upperBound="-1"
+        eType="#//DiagramElement" changeable="false" volatile="true" transient="true"
+        derived="true" eOpposite="#//DiagramElement/owningDiagramElement">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="a collection of diagram elements that are directly owned by this diagram element."/>
       </eAnnotations>
       <eAnnotations source="union"/>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="localStyle" ordered="false"
-        eType="#//Style" containment="true">
+        eType="#//Style" changeable="false" volatile="true" transient="true" derived="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="a reference to an optional locally-owned style for this diagram element."/>
       </eAnnotations>
+      <eAnnotations source="union"/>
     </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="sharedStyle" ordered="false"
-        eType="#//Style">
+        eType="#//Style" changeable="false" volatile="true" transient="true" derived="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="a reference to an optional shared style element for this diagram element."/>
       </eAnnotations>
+      <eAnnotations source="union"/>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="targetEdge" upperBound="-1"
+        eType="#//Edge" changeable="false" volatile="true" transient="true" derived="true"
+        eOpposite="#//Edge/targetDiagramElement">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="a collection of edges that reference this diagram element as a target."/>
+      </eAnnotations>
+      <eAnnotations source="union"/>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceEdge" upperBound="-1"
+        eType="#//Edge" changeable="false" volatile="true" transient="true" derived="true"
+        eOpposite="#//Edge/sourceDiagramElement">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="a collection of edges that reference this diagram element as a source."/>
+      </eAnnotations>
+      <eAnnotations source="union"/>
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Style" abstract="true">
@@ -54,28 +72,28 @@
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
       <details key="documentation" value="Edge is a diagram element that renders as a polyline, connecting a source diagram element to a target diagram element, and is positioned relative to the origin of the diagram."/>
     </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" ordered="false"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceDiagramElement" ordered="false"
         lowerBound="1" eType="#//DiagramElement" changeable="false" volatile="true"
-        transient="true" derived="true">
+        transient="true" derived="true" eOpposite="#//DiagramElement/sourceEdge">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="the edge's source diagram element, i.e. where the edge starts from."/>
       </eAnnotations>
       <eAnnotations source="union"/>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" ordered="false"
-        lowerBound="1" eType="#//DiagramElement" changeable="false" volatile="true"
-        transient="true" derived="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="the edge's target diagram element, i.e. where the edge ends at."/>
-      </eAnnotations>
-      <eAnnotations source="union"/>
-    </eStructuralFeatures>
     <eStructuralFeatures xsi:type="ecore:EReference" name="waypoint" upperBound="-1"
         eType="ecore:EClass DC.ecore#//Point" containment="true">
       <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
         <details key="documentation" value="an optional list of points relative to the origin of the nesting diagram that specifies the connected line segments of the edge"/>
       </eAnnotations>
     </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="targetDiagramElement" ordered="false"
+        lowerBound="1" eType="#//DiagramElement" changeable="false" volatile="true"
+        transient="true" derived="true" eOpposite="#//DiagramElement/targetEdge">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="the edge's target diagram element, i.e. where the edge ends at."/>
+      </eAnnotations>
+      <eAnnotations source="union"/>
+    </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Diagram" abstract="true" eSuperTypes="#//Shape">
     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.genmodel b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.genmodel
index 728214d1281..04e4c4db228 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.genmodel
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.genmodel
@@ -2,10 +2,11 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
     copyrightText="Copyright (c) 2014 CEA LIST.&#xA; &#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA; &#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
-    modelDirectory="/org.eclipse.papyrus.dd/src" modelPluginID="org.eclipse.papyrus.dd"
+    modelDirectory="/org.eclipse.papyrus.dd/src" creationSubmenus="true" modelPluginID="org.eclipse.papyrus.dd"
     modelName="DI" editPluginClass="org.eclipse.papyrus.dd.edit.DDEditPlugin" editorPluginClass="org.eclipse.papyrus.dd.editor.DDEditorPlugin"
     rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.uml2.uml.ecore.importer"
-    complianceLevel="7.0" copyrightFields="false" usedGenPackages="DC.genmodel#//dc ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
+    complianceLevel="7.0" copyrightFields="false" colorProviders="true" fontProviders="true"
+    usedGenPackages="DC.genmodel#//dc ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore"
     operationReflection="true" importOrganizing="true">
   <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
     <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
@@ -27,29 +28,33 @@
     <details key="CAMEL_CASE_NAMES" value="PROCESS"/>
     <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
   </genAnnotations>
-  <foreignModel>DI.cmof</foreignModel>
+  <foreignModel>DI.uml</foreignModel>
   <genPackages xsi:type="genmodel:GenPackage" prefix="DI" basePackage="org.eclipse.papyrus.dd"
       disposableProviderFactory="true" ecorePackage="DI.ecore#/">
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="DI.ecore#//DiagramElement">
-      <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
-          createChild="false" ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/modelElement"/>
-      <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
-          createChild="false" ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/owningElement"/>
-      <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
-          createChild="false" ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/ownedElement"/>
-      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
-          createChild="true" ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/localStyle"/>
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/sharedStyle"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/modelElement"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/owningDiagramElement"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/ownedDiagramElement"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/localStyle"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/sharedStyle"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/targetEdge"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference DI.ecore#//DiagramElement/sourceEdge"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="DI.ecore#//Style"/>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="DI.ecore#//Edge">
-      <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
-          createChild="false" ecoreFeature="ecore:EReference DI.ecore#//Edge/source"/>
-      <genFeatures xsi:type="genmodel:GenFeature" property="Readonly" notify="false"
-          createChild="false" ecoreFeature="ecore:EReference DI.ecore#//Edge/target"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference DI.ecore#//Edge/sourceDiagramElement"/>
       <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
           createChild="true" ecoreFeature="ecore:EReference DI.ecore#//Edge/waypoint"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference DI.ecore#//Edge/targetDiagramElement"/>
     </genClasses>
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="DI.ecore#//Diagram">
       <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute DI.ecore#//Diagram/name"/>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.notation b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.notation
new file mode 100644
index 00000000000..32305b42ab3
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.notation
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_orJEkPpLEeOw_Nx9vOEGaA" type="PapyrusUMLClassDiagram" name="DI Package" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_qudAIPpLEeOw_Nx9vOEGaA" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qudnMPpLEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qudnMfpLEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qudnMvpLEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qudnM_pLEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qudnNPpLEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qudnNfpLEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_qudnNvpLEeOw_Nx9vOEGaA" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qudnN_pLEeOw_Nx9vOEGaA" type="7017">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qudnOPpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_queOQPpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_queOQfpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_queOQvpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_queOQ_pLEeOw_Nx9vOEGaA" visible="false" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_queORPpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_queORfpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_queORvpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_queOR_pLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_queOSPpLEeOw_Nx9vOEGaA" visible="false" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_queOSfpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_queOSvpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_queOS_pLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_queOTPpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qu_LoPpLEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qu_LofpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qu_LovpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:Class" href="DI.uml#DiagramElement"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qudAIfpLEeOw_Nx9vOEGaA" x="260" y="40" height="160"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_qvCO8PpLEeOw_Nx9vOEGaA" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qvC2APpLEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qvC2AfpLEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qvC2AvpLEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qvC2A_pLEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qvC2BPpLEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qvC2BfpLEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_qvC2BvpLEeOw_Nx9vOEGaA" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvC2B_pLEeOw_Nx9vOEGaA" type="7017">
+      <children xmi:type="notation:Shape" xmi:id="_EaMlkPpMEeOw_Nx9vOEGaA" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DI.uml#Edge-waypoint"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_EaMlkfpMEeOw_Nx9vOEGaA"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvC2CPpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qvC2CfpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qvC2CvpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvC2C_pLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvC2DPpLEeOw_Nx9vOEGaA" visible="false" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvC2DfpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qvC2DvpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qvC2D_pLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvC2EPpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvC2EfpLEeOw_Nx9vOEGaA" visible="false" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvC2EvpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qvC2E_pLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qvC2FPpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvC2FfpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvI8oPpLEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvI8ofpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvI8ovpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:Class" href="DI.uml#Edge"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvCO8fpLEeOw_Nx9vOEGaA" x="65" y="259" width="216" height="45"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_qvLY4PpLEeOw_Nx9vOEGaA" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qvL_8PpLEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qvL_8fpLEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qvL_8vpLEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qvL_8_pLEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qvL_9PpLEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qvL_9fpLEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_qvL_9vpLEeOw_Nx9vOEGaA" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvL_9_pLEeOw_Nx9vOEGaA" type="7017">
+      <children xmi:type="notation:Shape" xmi:id="_G-mcAPpMEeOw_Nx9vOEGaA" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DI.uml#Diagram-name"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G-mcAfpMEeOw_Nx9vOEGaA"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_G-nDEPpMEeOw_Nx9vOEGaA" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DI.uml#Diagram-documentation"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G-nDEfpMEeOw_Nx9vOEGaA"/>
+      </children>
+      <children xmi:type="notation:Shape" xmi:id="_G-nqIPpMEeOw_Nx9vOEGaA" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DI.uml#Diagram-resolution"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_G-nqIfpMEeOw_Nx9vOEGaA"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvL_-PpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qvL_-fpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qvL_-vpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvL_-_pLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvL__PpLEeOw_Nx9vOEGaA" visible="false" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvL__fpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qvL__vpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qvL___pLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvMAAPpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvMnAPpLEeOw_Nx9vOEGaA" visible="false" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvMnAfpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qvMnAvpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qvMnA_pLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvMnBPpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvSGkPpLEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvSGkfpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvSGkvpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:Class" href="DI.uml#Diagram"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvLY4fpLEeOw_Nx9vOEGaA" x="340" y="337" height="83"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_qvUi0PpLEeOw_Nx9vOEGaA" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qvVJ4PpLEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qvVJ4fpLEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qvVJ4vpLEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qvVJ4_pLEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qvVJ5PpLEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qvVJ5fpLEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_qvVJ5vpLEeOw_Nx9vOEGaA" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvVJ5_pLEeOw_Nx9vOEGaA" type="7017">
+      <children xmi:type="notation:Shape" xmi:id="_C-9WoPpMEeOw_Nx9vOEGaA" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+        <element xmi:type="uml:Property" href="DI.uml#Shape-bounds"/>
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_C-9WofpMEeOw_Nx9vOEGaA"/>
+      </children>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvVJ6PpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qvVJ6fpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qvVJ6vpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvVJ6_pLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvVJ7PpLEeOw_Nx9vOEGaA" visible="false" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvVJ7fpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qvVJ7vpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qvVJ7_pLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvVJ8PpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvVw8PpLEeOw_Nx9vOEGaA" visible="false" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvVw8fpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qvVw8vpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qvVw8_pLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvVw9PpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvbQgPpLEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvbQgfpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvbQgvpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:Class" href="DI.uml#Shape"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvUi0fpLEeOw_Nx9vOEGaA" x="336" y="255" height="45"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_qvdswPpLEeOw_Nx9vOEGaA" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qveT0PpLEeOw_Nx9vOEGaA" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qveT0fpLEeOw_Nx9vOEGaA" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qveT0vpLEeOw_Nx9vOEGaA" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qveT0_pLEeOw_Nx9vOEGaA" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qveT1PpLEeOw_Nx9vOEGaA" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qveT1fpLEeOw_Nx9vOEGaA" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_qveT1vpLEeOw_Nx9vOEGaA" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qveT1_pLEeOw_Nx9vOEGaA" type="7017">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qveT2PpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qveT2fpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qveT2vpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qveT2_pLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qveT3PpLEeOw_Nx9vOEGaA" visible="false" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qveT3fpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qveT3vpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qveT3_pLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qveT4PpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qveT4fpLEeOw_Nx9vOEGaA" visible="false" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qveT4vpLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_qveT4_pLEeOw_Nx9vOEGaA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_qveT5PpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qveT5fpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_qvkacPpLEeOw_Nx9vOEGaA" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_qvkacfpLEeOw_Nx9vOEGaA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvkacvpLEeOw_Nx9vOEGaA"/>
+    </children>
+    <element xmi:type="uml:Class" href="DI.uml#Style"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qvdswfpLEeOw_Nx9vOEGaA" x="620" y="99" height="101"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_ANc7gPpQEeO_u4Z14juDDg" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ANeJoPpQEeO_u4Z14juDDg" source="ShadowFigure">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ANeJofpQEeO_u4Z14juDDg" key="ShadowFigure_Value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ANeJovpQEeO_u4Z14juDDg" source="displayNameLabelIcon">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ANewsPpQEeO_u4Z14juDDg" key="displayNameLabelIcon_value" value="false"/>
+    </eAnnotations>
+    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ANewsfpQEeO_u4Z14juDDg" source="QualifiedName">
+      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ANewsvpQEeO_u4Z14juDDg" key="QualifiedNameDepth" value="1000"/>
+    </eAnnotations>
+    <children xmi:type="notation:DecorationNode" xmi:id="_ANews_pQEeO_u4Z14juDDg" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ANewtPpQEeO_u4Z14juDDg" visible="false" type="7017">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ANewtfpQEeO_u4Z14juDDg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ANewtvpQEeO_u4Z14juDDg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ANewt_pQEeO_u4Z14juDDg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ANewuPpQEeO_u4Z14juDDg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ANewufpQEeO_u4Z14juDDg" visible="false" type="7018">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ANewuvpQEeO_u4Z14juDDg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ANewu_pQEeO_u4Z14juDDg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ANewvPpQEeO_u4Z14juDDg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ANewvfpQEeO_u4Z14juDDg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ANfXwPpQEeO_u4Z14juDDg" visible="false" type="7019">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ANfXwfpQEeO_u4Z14juDDg"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_ANfXwvpQEeO_u4Z14juDDg"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_ANfXw_pQEeO_u4Z14juDDg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ANfXxPpQEeO_u4Z14juDDg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ANuBQPpQEeO_u4Z14juDDg" visible="false" type="AppliedStereotypeCompartement">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ANuBQfpQEeO_u4Z14juDDg" showTitle="true"/>
+      <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#_QzwkEatKEeGF4uwJob34Mw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ANuBQvpQEeO_u4Z14juDDg"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_ANwdgPpQEeO_u4Z14juDDg" visible="false" type="compartment_shape_display">
+      <styles xmi:type="notation:TitleStyle" xmi:id="_ANwdgfpQEeO_u4Z14juDDg"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ANwdgvpQEeO_u4Z14juDDg"/>
+    </children>
+    <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EObject"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ANc7gfpQEeO_u4Z14juDDg" x="620" y="39" height="41"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_orJEkfpLEeOw_Nx9vOEGaA"/>
+  <element xmi:type="uml:Package" href="DI.uml#_0"/>
+  <edges xmi:type="notation:Connector" xmi:id="_ALvrUPpQEeO_u4Z14juDDg" type="4001" source="_qudAIPpLEeOw_Nx9vOEGaA" target="_qvCO8PpLEeOw_Nx9vOEGaA" routing="Rectilinear" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_ALz8wPpQEeO_u4Z14juDDg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_ALz8wfpQEeO_u4Z14juDDg" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AL0j0PpQEeO_u4Z14juDDg" visible="false" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AL0j0fpQEeO_u4Z14juDDg" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AL0j0vpQEeO_u4Z14juDDg" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AL0j0_pQEeO_u4Z14juDDg" x="64" y="8"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AL0j1PpQEeO_u4Z14juDDg" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AL0j1fpQEeO_u4Z14juDDg" x="10" y="40"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AL0j1vpQEeO_u4Z14juDDg" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AL0j1_pQEeO_u4Z14juDDg" x="24" y="-12"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AL0j2PpQEeO_u4Z14juDDg" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AL0j2fpQEeO_u4Z14juDDg" x="-8" y="30"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_ALvrUfpQEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+    <element xmi:type="uml:Association" href="DI.uml#A_target_targetEdge"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ALvrUvpQEeO_u4Z14juDDg" points="[-50, 50, 87, -102]$[-130, 50, 7, -102]$[-130, 130, 7, -22]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_AMtUoPpQEeO_u4Z14juDDg" type="4001" source="_qudAIPpLEeOw_Nx9vOEGaA" target="_qvCO8PpLEeOw_Nx9vOEGaA" routing="Rectilinear" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_AMt7sPpQEeO_u4Z14juDDg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AMt7sfpQEeO_u4Z14juDDg" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AMt7svpQEeO_u4Z14juDDg" visible="false" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AMuiwPpQEeO_u4Z14juDDg" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AMuiwfpQEeO_u4Z14juDDg" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AMuiwvpQEeO_u4Z14juDDg" x="44" y="-12"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AMuiw_pQEeO_u4Z14juDDg" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AMuixPpQEeO_u4Z14juDDg" x="31" y="52"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AMuixfpQEeO_u4Z14juDDg" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AMuixvpQEeO_u4Z14juDDg" x="7" y="14"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AMuix_pQEeO_u4Z14juDDg" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AMuiyPpQEeO_u4Z14juDDg" x="11" y="43"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_AMtUofpQEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+    <element xmi:type="uml:Association" href="DI.uml#A_source_sourceEdge"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AMtUovpQEeO_u4Z14juDDg" points="[-50, 0, 87, -161]$[-217, 0, -80, -161]$[-217, 139, -80, -22]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_AM-aYPpQEeO_u4Z14juDDg" type="4001" source="_qudAIPpLEeOw_Nx9vOEGaA" target="_qudAIPpLEeOw_Nx9vOEGaA" routing="Rectilinear" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_AM_BcPpQEeO_u4Z14juDDg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AM_BcfpQEeO_u4Z14juDDg" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AM_BcvpQEeO_u4Z14juDDg" visible="false" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AM_Bc_pQEeO_u4Z14juDDg" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AM_BdPpQEeO_u4Z14juDDg" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AM_BdfpQEeO_u4Z14juDDg" x="49" y="-15"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AM_BdvpQEeO_u4Z14juDDg" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AM_ogPpQEeO_u4Z14juDDg" x="-62" y="6"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AM_ogfpQEeO_u4Z14juDDg" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AM_ogvpQEeO_u4Z14juDDg" x="-49" y="-15"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AM_og_pQEeO_u4Z14juDDg" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AM_ohPpQEeO_u4Z14juDDg" x="-85" y="-14"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_AM-aYfpQEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+    <element xmi:type="uml:Association" href="DI.uml#A_ownedElement_owningElement"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AM-aYvpQEeO_u4Z14juDDg" points="[0, -80, 0, -80]$[0, -109, 0, -109]$[-170, -109, -170, -109]$[-170, -40, -170, -40]$[-50, -40, -50, -40]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_AN6OgPpQEeO_u4Z14juDDg" type="4001" source="_ANc7gPpQEeO_u4Z14juDDg" target="_qudAIPpLEeOw_Nx9vOEGaA" routing="Rectilinear" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_AN61kPpQEeO_u4Z14juDDg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AN61kfpQEeO_u4Z14juDDg" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AN61kvpQEeO_u4Z14juDDg" visible="false" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AN61k_pQEeO_u4Z14juDDg" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AN61lPpQEeO_u4Z14juDDg" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AN61lfpQEeO_u4Z14juDDg" x="41" y="-6"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AN61lvpQEeO_u4Z14juDDg" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AN61l_pQEeO_u4Z14juDDg" x="-15" y="14"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AN61mPpQEeO_u4Z14juDDg" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AN61mfpQEeO_u4Z14juDDg" x="13" y="14"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AN61mvpQEeO_u4Z14juDDg" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AN7coPpQEeO_u4Z14juDDg" x="20" y="-6"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_AN6OgfpQEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+    <element xmi:type="uml:Association" href="DI.uml#A_modelElement_diagramElement"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AN6OgvpQEeO_u4Z14juDDg" points="[-50, 1, 250, -60]$[-250, 1, 50, -60]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_AOI4APpQEeO_u4Z14juDDg" type="4001" source="_qvdswPpLEeOw_Nx9vOEGaA" target="_qudAIPpLEeOw_Nx9vOEGaA" routing="Rectilinear" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_AOJfEPpQEeO_u4Z14juDDg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AOJfEfpQEeO_u4Z14juDDg" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AOJfEvpQEeO_u4Z14juDDg" visible="false" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AOJfE_pQEeO_u4Z14juDDg" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AOJfFPpQEeO_u4Z14juDDg" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AOJfFfpQEeO_u4Z14juDDg" x="32" y="-7"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AOJfFvpQEeO_u4Z14juDDg" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AOKGIPpQEeO_u4Z14juDDg" x="-31" y="14"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AOKGIfpQEeO_u4Z14juDDg" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AOKGIvpQEeO_u4Z14juDDg" x="13" y="13"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AOKGI_pQEeO_u4Z14juDDg" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AOKGJPpQEeO_u4Z14juDDg" x="15" y="-7"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_AOI4AfpQEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+    <element xmi:type="uml:Association" href="DI.uml#A_sharedStyle_styledElement"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AOI4AvpQEeO_u4Z14juDDg" points="[-50, -29, 250, 0]$[-250, -29, 50, 0]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_AOW6cPpQEeO_u4Z14juDDg" type="4001" source="_qvdswPpLEeOw_Nx9vOEGaA" target="_qudAIPpLEeOw_Nx9vOEGaA" routing="Rectilinear" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_AOXhgPpQEeO_u4Z14juDDg" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AOXhgfpQEeO_u4Z14juDDg" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AOXhgvpQEeO_u4Z14juDDg" visible="false" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AOYIkPpQEeO_u4Z14juDDg" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AOYIkfpQEeO_u4Z14juDDg" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AOYIkvpQEeO_u4Z14juDDg" x="31" y="-6"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AOYIk_pQEeO_u4Z14juDDg" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AOYIlPpQEeO_u4Z14juDDg" x="-31" y="14"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AOYIlfpQEeO_u4Z14juDDg" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AOYIlvpQEeO_u4Z14juDDg" x="7" y="14"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_AOYIl_pQEeO_u4Z14juDDg" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_AOYImPpQEeO_u4Z14juDDg" x="-12" y="-6"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_AOW6cfpQEeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+    <element xmi:type="uml:Association" href="DI.uml#A_localStyle_styledElement"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_AOW6cvpQEeO_u4Z14juDDg" points="[-50, 31, 250, 60]$[-250, 31, 50, 60]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_TVu-gPpREeO_u4Z14juDDg" type="4002" source="_qvLY4PpLEeOw_Nx9vOEGaA" target="_qvUi0PpLEeOw_Nx9vOEGaA" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_TVvlkPpREeO_u4Z14juDDg" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_TVvlkfpREeO_u4Z14juDDg" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_TVu-gfpREeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+    <element xmi:type="uml:Generalization" href="DI.uml#_pub6Ifo2EeOw_Nx9vOEGaA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_TVu-gvpREeO_u4Z14juDDg" points="[-6, -41, 7, 60]$[-10, -78, 3, 23]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_UBgfYPpREeO_u4Z14juDDg" type="4002" source="_qvCO8PpLEeOw_Nx9vOEGaA" target="_qudAIPpLEeOw_Nx9vOEGaA" routing="Tree" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_UBhGcPpREeO_u4Z14juDDg" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_UBhGcfpREeO_u4Z14juDDg" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_UBgfYfpREeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+    <element xmi:type="uml:Generalization" href="DI.uml#_pub6IPo2EeOw_Nx9vOEGaA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UBgfYvpREeO_u4Z14juDDg" points="[67, -22, -70, 139]$[67, -49, -70, 112]$[137, -49, 0, 112]$[137, -81, 0, 80]"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_Ux1wIPpREeO_u4Z14juDDg" type="4002" source="_qvUi0PpLEeOw_Nx9vOEGaA" target="_qudAIPpLEeOw_Nx9vOEGaA" routing="Tree" lineColor="0">
+    <children xmi:type="notation:DecorationNode" xmi:id="_Ux2XMPpREeO_u4Z14juDDg" type="6007">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ux2XMfpREeO_u4Z14juDDg" y="40"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_Ux1wIfpREeO_u4Z14juDDg" fontName="Lucida Grande" fontHeight="11"/>
+    <element xmi:type="uml:Generalization" href="DI.uml#_pub6Ivo2EeOw_Nx9vOEGaA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ux1wIvpREeO_u4Z14juDDg" points="[-28, -22, 70, 135]$[-28, -45, 70, 112]$[-98, -45, 0, 112]$[-98, -77, 0, 80]"/>
+  </edges>
+</notation:Diagram>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.uml b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.uml
new file mode 100644
index 00000000000..4d3fdd120b8
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/model/DI.uml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+  <uml:Package xmi:id="_0" name="DI" URI="http://www.omg.org/spec/DD/20110901/DI">
+    <ownedComment xmi:id="_ownedComment.0" annotatedElement="_0">
+      <body>The Diagram Interchange (DI) package enables interchange of graphical information that language users have control over, such as position of nodes and line routing points. Language specifications specialize elements of DI to define diagram interchange elements for a language.</body>
+    </ownedComment>
+    <packageImport xmi:id="_packageImport.0">
+      <importedPackage href="DC.uml#_0"/>
+    </packageImport>
+    <packagedElement xmi:type="uml:Class" xmi:id="DiagramElement" name="DiagramElement" isAbstract="true">
+      <ownedComment xmi:id="DiagramElement-_ownedComment.0" annotatedElement="DiagramElement">
+        <body>DiagramElement is the abstract super type of all elements in diagrams, including diagrams themselves. When contained in a diagram, diagram elements are laid out relative to the diagram’s origin.</body>
+      </ownedComment>
+      <ownedAttribute xmi:id="DiagramElement-modelElement" name="modelElement" visibility="public" isOrdered="true" isDerived="true" isDerivedUnion="true" association="A_modelElement_diagramElement">
+        <ownedComment xmi:id="DiagramElement-modelElement-_ownedComment.0" annotatedElement="DiagramElement-modelElement">
+          <body>a reference to a depicted model element, which can be any MOF-based element</body>
+        </ownedComment>
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/Ecore.metamodel.uml#EObject"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_puasAPo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_K25icPp8EeOzRJ7_zNC4UA" value="*"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_Or3lgP81EeObup8tdlL4zw" value=""/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="DiagramElement-owningElement" name="owningDiagramElement" visibility="public" type="DiagramElement" isDerived="true" isDerivedUnion="true" association="A_ownedElement_owningElement">
+        <ownedComment xmi:id="DiagramElement-owningElement-_ownedComment.0" annotatedElement="DiagramElement-owningElement">
+          <body>a reference to the diagram element that directly owns this diagram element.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_puasAfo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="DiagramElement-ownedElement" name="ownedDiagramElement" visibility="public" type="DiagramElement" isOrdered="true" aggregation="composite" isDerived="true" isDerivedUnion="true" association="A_ownedElement_owningElement">
+        <ownedComment xmi:id="DiagramElement-ownedElement-_ownedComment.0" annotatedElement="DiagramElement-ownedElement">
+          <body>a collection of diagram elements that are directly owned by this diagram element.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_puasAvo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_puasA_o2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="DiagramElement-localStyle" name="localStyle" visibility="public" type="Style" aggregation="composite" isDerived="true" isDerivedUnion="true" association="A_localStyle_styledElement">
+        <ownedComment xmi:id="DiagramElement-localStyle-_ownedComment.0" annotatedElement="DiagramElement-localStyle">
+          <body>a reference to an optional locally-owned style for this diagram element.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_puasBPo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="DiagramElement-sharedStyle" name="sharedStyle" visibility="public" type="Style" isDerived="true" isDerivedUnion="true" association="A_sharedStyle_styledElement">
+        <ownedComment xmi:id="DiagramElement-sharedStyle-_ownedComment.0" annotatedElement="DiagramElement-sharedStyle">
+          <body>a reference to an optional shared style element for this diagram element.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_puasBfo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="A_target_targetEdge-targetEdge" name="targetEdge" visibility="public" type="Edge" isOrdered="true" isDerived="true" isDerivedUnion="true" association="A_target_targetEdge">
+        <ownedComment xmi:id="A_target_targetEdge-targetEdge-_ownedComment.0" annotatedElement="A_target_targetEdge-targetEdge">
+          <body>a collection of edges that reference this diagram element as a target.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pubTFvo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pubTF_o2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="A_source_sourceEdge-sourceEdge" name="sourceEdge" visibility="public" type="Edge" isOrdered="true" isDerived="true" isDerivedUnion="true" association="A_source_sourceEdge">
+        <ownedComment xmi:id="A_source_sourceEdge-sourceEdge-_ownedComment.0" annotatedElement="A_source_sourceEdge-sourceEdge">
+          <body>a collection of edges that reference this diagram element as a source.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pubTGPo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pubTGfo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Edge" name="Edge" isAbstract="true">
+      <ownedComment xmi:id="Edge-_ownedComment.0" annotatedElement="Edge">
+        <body>Edge is a diagram element that renders as a polyline, connecting a source diagram element to a target diagram element, and is positioned relative to the origin of the diagram.</body>
+      </ownedComment>
+      <generalization xmi:id="_pub6IPo2EeOw_Nx9vOEGaA" general="DiagramElement"/>
+      <ownedAttribute xmi:id="Edge-source" name="sourceDiagramElement" visibility="public" type="DiagramElement" isDerived="true" isDerivedUnion="true" association="A_source_sourceEdge">
+        <ownedComment xmi:id="Edge-source-_ownedComment.0" annotatedElement="Edge-source">
+          <body>the edge's source diagram element, i.e. where the edge starts from.</body>
+        </ownedComment>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Edge-target" name="targetDiagramElement" visibility="public" type="DiagramElement" isDerived="true" isDerivedUnion="true" association="A_target_targetEdge">
+        <ownedComment xmi:id="Edge-target-_ownedComment.0" annotatedElement="Edge-target">
+          <body>the edge's target diagram element, i.e. where the edge ends at.</body>
+        </ownedComment>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Edge-waypoint" name="waypoint" visibility="public" isOrdered="true">
+        <ownedComment xmi:id="Edge-waypoint-_ownedComment.0" annotatedElement="Edge-waypoint">
+          <body>an optional list of points relative to the origin of the nesting diagram that specifies the connected line segments of the edge</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Point"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pubTEPo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pubTEfo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Diagram" name="Diagram" isAbstract="true">
+      <ownedComment xmi:id="Diagram-_ownedComment.0" annotatedElement="Diagram">
+        <body>Diagram is an abstract container of a graph of diagram elements. Diagrams are diagram elements with an origin point in the x-y coordinate system. Their elements are laid out relative to their origin point.</body>
+      </ownedComment>
+      <generalization xmi:id="_pub6Ifo2EeOw_Nx9vOEGaA" general="Shape"/>
+      <ownedAttribute xmi:id="Diagram-name" name="name" visibility="public">
+        <ownedComment xmi:id="Diagram-name-_ownedComment.0" annotatedElement="Diagram-name">
+          <body>the name of the diagram.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_pubTEvo2EeOw_Nx9vOEGaA" value=""/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Diagram-documentation" name="documentation" visibility="public">
+        <ownedComment xmi:id="Diagram-documentation-_ownedComment.0" annotatedElement="Diagram-documentation">
+          <body>the documentation of the diagram.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#String"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_pubTE_o2EeOw_Nx9vOEGaA" value=""/>
+      </ownedAttribute>
+      <ownedAttribute xmi:id="Diagram-resolution" name="resolution" visibility="public">
+        <ownedComment xmi:id="Diagram-resolution-_ownedComment.0" annotatedElement="Diagram-resolution">
+          <body>the resolution of the diagram expressed in user units per inch.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="DC.uml#Real"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_pubTFPo2EeOw_Nx9vOEGaA" value="300"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Shape" name="Shape" isAbstract="true">
+      <ownedComment xmi:id="Shape-_ownedComment.0" annotatedElement="Shape">
+        <body>Shape is a diagram element with given bounds that is laid out relative to the origin of the diagram</body>
+      </ownedComment>
+      <generalization xmi:id="_pub6Ivo2EeOw_Nx9vOEGaA" general="DiagramElement"/>
+      <ownedAttribute xmi:id="Shape-bounds" name="bounds" visibility="public">
+        <ownedComment xmi:id="Shape-bounds-_ownedComment.0" annotatedElement="Shape-bounds">
+          <body>the optional bounds of the shape relative to the origin of its nesting plane.</body>
+        </ownedComment>
+        <type xmi:type="uml:DataType" href="DC.uml#Bounds"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pubTFfo2EeOw_Nx9vOEGaA"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="Style" name="Style" isAbstract="true">
+      <ownedComment xmi:id="Style-_ownedComment.0" annotatedElement="Style">
+        <body>Style contains formatting properties that affect the appearance or style of diagram elements, including diagram themselves.</body>
+      </ownedComment>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_target_targetEdge" name="A_targetDiagramElement_targetEdge" memberEnd="Edge-target A_target_targetEdge-targetEdge"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_source_sourceEdge" name="A_sourceDiagramElement_sourceEdge" memberEnd="Edge-source A_source_sourceEdge-sourceEdge"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_ownedElement_owningElement" name="A_ownedDiagramElement_owningDiagramElement" memberEnd="DiagramElement-ownedElement DiagramElement-owningElement"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_modelElement_diagramElement" name="A_modelElement_diagramElement" memberEnd="DiagramElement-modelElement A_modelElement_diagramElement-diagramElement">
+      <ownedEnd xmi:id="A_modelElement_diagramElement-diagramElement" name="diagramElement" visibility="public" type="DiagramElement" isDerived="true" isDerivedUnion="true" association="A_modelElement_diagramElement">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pubTGvo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pubTG_o2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_sharedStyle_styledElement" name="A_sharedStyle_styledDiagramElement" memberEnd="DiagramElement-sharedStyle A_sharedStyle_styledElement-styledElement">
+      <ownedEnd xmi:id="A_sharedStyle_styledElement-styledElement" name="styledDiagramElement" visibility="public" type="DiagramElement" isDerived="true" isDerivedUnion="true" association="A_sharedStyle_styledElement">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pubTHPo2EeOw_Nx9vOEGaA"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_pubTHfo2EeOw_Nx9vOEGaA" value="*"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_localStyle_styledElement" name="A_localStyle_styledDiagramElement" memberEnd="DiagramElement-localStyle A_localStyle_styledElement-styledElement">
+      <ownedEnd xmi:id="A_localStyle_styledElement-styledElement" name="styledDiagramElement" visibility="public" type="DiagramElement" isDerived="true" isDerivedUnion="true" association="A_localStyle_styledElement">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_pubTHvo2EeOw_Nx9vOEGaA"/>
+      </ownedEnd>
+    </packagedElement>
+    <profileApplication xmi:id="_vpIUIM6KEeOqlr8E3pzO9g">
+      <eAnnotations xmi:id="_vpL-gM6KEeOqlr8E3pzO9g" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
+      </eAnnotations>
+      <appliedProfile href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+    </profileApplication>
+    <xmi:Extension extender="http://www.eclipse.org/uml2/4.0.0/UML">
+      
+    </xmi:Extension>
+  </uml:Package>
+  <Ecore:EPackage xmi:id="_vqpXEM6KEeOqlr8E3pzO9g" base_Package="_0" packageName="di" nsPrefix="di" basePackage="org.eclipse.papyrus.dd" prefix="DI"/>
+</xmi:XMI>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/plugin.xml b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/plugin.xml
index 73e4254ed4d..683d5ecadd6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/plugin.xml
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/plugin.xml
@@ -39,4 +39,11 @@
             genModel="model/DI.genmodel"/>
    </extension>
 
+   <extension point="org.eclipse.emf.ecore.uri_mapping">
+      <mapping
+          source="pathmap://DIAGRAM_DEFINITION/"
+          target="platform:/plugin/org.eclipse.papyrus.dd/model/">
+      </mapping>
+   </extension>
+
 </plugin>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java
index b6ec9d416a7..a2980485f52 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java
@@ -20,21 +20,21 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Bounds</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Bounds specifies a rectangular area in some x-y
- * coordinate system that is defined by a location (x and y) and a size (width
- * and height). <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Bounds specifies a rectangular area in some x-y coordinate system that is defined by a location (x and y) and a size (width and height).
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dc.DCPackage#getBounds()
  * @model
  * @generated
@@ -57,11 +57,9 @@ public interface Bounds extends EObject {
 	double getX();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getX
-	 * <em>X</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>X</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>X</em>' attribute.
 	 * @see #isSetX()
 	 * @see #unsetX()
 	 * @see #getX()
@@ -70,9 +68,8 @@ public interface Bounds extends EObject {
 	void setX(double value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getX
-	 * <em>X</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetX()
 	 * @see #getX()
 	 * @see #setX(double)
@@ -81,10 +78,8 @@ public interface Bounds extends EObject {
 	void unsetX();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}' attribute is
-	 * set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>X</em>' attribute is set.
 	 * @see #unsetX()
 	 * @see #getX()
@@ -109,11 +104,9 @@ public interface Bounds extends EObject {
 	double getY();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getY
-	 * <em>Y</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Y</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Y</em>' attribute.
 	 * @see #isSetY()
 	 * @see #unsetY()
 	 * @see #getY()
@@ -122,9 +115,8 @@ public interface Bounds extends EObject {
 	void setY(double value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getY
-	 * <em>Y</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetY()
 	 * @see #getY()
 	 * @see #setY(double)
@@ -133,10 +125,8 @@ public interface Bounds extends EObject {
 	void unsetY();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}' attribute is
-	 * set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Y</em>' attribute is set.
 	 * @see #unsetY()
 	 * @see #getY()
@@ -161,11 +151,9 @@ public interface Bounds extends EObject {
 	double getWidth();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth
-	 * <em>Width</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Width</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Width</em>' attribute.
 	 * @see #isSetWidth()
 	 * @see #unsetWidth()
 	 * @see #getWidth()
@@ -174,10 +162,8 @@ public interface Bounds extends EObject {
 	void setWidth(double value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetWidth()
 	 * @see #getWidth()
 	 * @see #setWidth(double)
@@ -186,10 +172,8 @@ public interface Bounds extends EObject {
 	void unsetWidth();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}'
-	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Width</em>' attribute is set.
 	 * @see #unsetWidth()
 	 * @see #getWidth()
@@ -226,10 +210,8 @@ public interface Bounds extends EObject {
 	void setHeight(double value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetHeight()
 	 * @see #getHeight()
 	 * @see #setHeight(double)
@@ -238,10 +220,8 @@ public interface Bounds extends EObject {
 	void unsetHeight();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}'
-	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Height</em>' attribute is set.
 	 * @see #unsetHeight()
 	 * @see #getHeight()
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java
index ebecccd1f12..b364e15c327 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java
@@ -16,51 +16,50 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
  * create method for each non-abstract class of the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.papyrus.dd.dc.DCPackage
  * @generated
  */
 public interface DCFactory extends EFactory {
 
 	/**
-	 * The singleton instance of the factory. <!-- begin-user-doc --> <!--
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	DCFactory eINSTANCE = org.eclipse.papyrus.dd.dc.impl.DCFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>Point</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Point</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Point</em>'.
 	 * @generated
 	 */
 	Point createPoint();
 
 	/**
-	 * Returns a new object of class '<em>Dimension</em>'. <!-- begin-user-doc
+	 * Returns a new object of class '<em>Dimension</em>'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Dimension</em>'.
 	 * @generated
 	 */
 	Dimension createDimension();
 
 	/**
-	 * Returns a new object of class '<em>Bounds</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Bounds</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Bounds</em>'.
 	 * @generated
 	 */
 	Bounds createBounds();
 
 	/**
-	 * Returns the package supported by this factory. <!-- begin-user-doc -->
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java
index 82e124103ec..f15cee65e34 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java
@@ -40,39 +40,37 @@ import org.eclipse.emf.ecore.EPackage;
 public interface DCPackage extends EPackage {
 
 	/**
-	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The package name.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	String eNAME = "dc";
 
 	/**
-	 * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The package namespace URI.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	String eNS_URI = "http://www.omg.org/spec/DD/20110901/DC";
 
 	/**
-	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The package namespace name.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	String eNS_PREFIX = "dc";
 
 	/**
-	 * The singleton instance of the package. <!-- begin-user-doc --> <!--
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	DCPackage eINSTANCE = org.eclipse.papyrus.dd.dc.impl.DCPackageImpl.init();
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dc.impl.PointImpl <em>Point</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dc.impl.PointImpl <em>Point</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dc.impl.PointImpl
 	 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getPoint()
 	 * @generated
@@ -80,18 +78,18 @@ public interface DCPackage extends EPackage {
 	int POINT = 0;
 
 	/**
-	 * The feature id for the '<em><b>X</b></em>' attribute. <!-- begin-user-doc
+	 * The feature id for the '<em><b>X</b></em>' attribute.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int POINT__X = 0;
 
 	/**
-	 * The feature id for the '<em><b>Y</b></em>' attribute. <!-- begin-user-doc
+	 * The feature id for the '<em><b>Y</b></em>' attribute.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -116,10 +114,8 @@ public interface DCPackage extends EPackage {
 	int POINT_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl <em>Dimension</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl <em>Dimension</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dc.impl.DimensionImpl
 	 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getDimension()
 	 * @generated
@@ -181,10 +177,8 @@ public interface DCPackage extends EPackage {
 	int DIMENSION_OPERATION_COUNT = 2;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl <em>Bounds</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl <em>Bounds</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dc.impl.BoundsImpl
 	 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getBounds()
 	 * @generated
@@ -192,18 +186,18 @@ public interface DCPackage extends EPackage {
 	int BOUNDS = 2;
 
 	/**
-	 * The feature id for the '<em><b>X</b></em>' attribute. <!-- begin-user-doc
+	 * The feature id for the '<em><b>X</b></em>' attribute.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int BOUNDS__X = 0;
 
 	/**
-	 * The feature id for the '<em><b>Y</b></em>' attribute. <!-- begin-user-doc
+	 * The feature id for the '<em><b>Y</b></em>' attribute.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -293,9 +287,9 @@ public interface DCPackage extends EPackage {
 	int INTEGER = 5;
 
 	/**
-	 * The meta object id for the '<em>Real</em>' data type. <!-- begin-user-doc
+	 * The meta object id for the '<em>Real</em>' data type.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getReal()
 	 * @generated
 	 */
@@ -368,10 +362,8 @@ public interface DCPackage extends EPackage {
 	EClass getDimension();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the attribute '<em>Width</em>'.
 	 * @see org.eclipse.papyrus.dd.dc.Dimension#getWidth()
 	 * @see #getDimension()
@@ -380,10 +372,8 @@ public interface DCPackage extends EPackage {
 	EAttribute getDimension_Width();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the attribute '<em>Height</em>'.
 	 * @see org.eclipse.papyrus.dd.dc.Dimension#getHeight()
 	 * @see #getDimension()
@@ -392,27 +382,21 @@ public interface DCPackage extends EPackage {
 	EAttribute getDimension_Height();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Non Negative Width</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Width</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Non Negative Width</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getDimension__NonNegativeWidth__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Non Negative Height</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Height</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Non Negative Height</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getDimension__NonNegativeHeight__DiagnosticChain_Map();
@@ -477,27 +461,21 @@ public interface DCPackage extends EPackage {
 	EAttribute getBounds_Height();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Non Negative Width</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Width</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Non Negative Width</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getBounds__NonNegativeWidth__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Non Negative Height</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Height</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Non Negative Height</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getBounds__NonNegativeHeight__DiagnosticChain_Map();
@@ -544,9 +522,8 @@ public interface DCPackage extends EPackage {
 	EDataType getReal();
 
 	/**
-	 * Returns the meta object for data type '{@link java.lang.String
-	 * <em>String</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for data type '{@link java.lang.String <em>String</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for data type '<em>String</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -555,9 +532,8 @@ public interface DCPackage extends EPackage {
 	EDataType getString();
 
 	/**
-	 * Returns the meta object for data type '{@link java.awt.Color
-	 * <em>Color</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for data type '{@link java.awt.Color <em>Color</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for data type '<em>Color</em>'.
 	 * @see java.awt.Color
 	 * @model instanceClass="java.awt.Color"
@@ -585,16 +561,13 @@ public interface DCPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	interface Literals {
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dc.impl.PointImpl <em>Point</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dc.impl.PointImpl <em>Point</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dc.impl.PointImpl
 		 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getPoint()
 		 * @generated
@@ -602,17 +575,15 @@ public interface DCPackage extends EPackage {
 		EClass POINT = eINSTANCE.getPoint();
 
 		/**
-		 * The meta object literal for the '<em><b>X</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>X</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute POINT__X = eINSTANCE.getPoint_X();
 
 		/**
-		 * The meta object literal for the '<em><b>Y</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Y</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute POINT__Y = eINSTANCE.getPoint_Y();
@@ -630,44 +601,36 @@ public interface DCPackage extends EPackage {
 		EClass DIMENSION = eINSTANCE.getDimension();
 
 		/**
-		 * The meta object literal for the '<em><b>Width</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Width</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute DIMENSION__WIDTH = eINSTANCE.getDimension_Width();
 
 		/**
-		 * The meta object literal for the '<em><b>Height</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Height</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute DIMENSION__HEIGHT = eINSTANCE.getDimension_Height();
 
 		/**
-		 * The meta object literal for the '<em><b>Non Negative Width</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Non Negative Width</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getDimension__NonNegativeWidth__DiagnosticChain_Map();
+		EOperation DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE.getDimension__NonNegativeWidth__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '<em><b>Non Negative Height</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Non Negative Height</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getDimension__NonNegativeHeight__DiagnosticChain_Map();
+		EOperation DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getDimension__NonNegativeHeight__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl <em>Bounds</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl <em>Bounds</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dc.impl.BoundsImpl
 		 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getBounds()
 		 * @generated
@@ -675,60 +638,50 @@ public interface DCPackage extends EPackage {
 		EClass BOUNDS = eINSTANCE.getBounds();
 
 		/**
-		 * The meta object literal for the '<em><b>X</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>X</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute BOUNDS__X = eINSTANCE.getBounds_X();
 
 		/**
-		 * The meta object literal for the '<em><b>Y</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Y</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute BOUNDS__Y = eINSTANCE.getBounds_Y();
 
 		/**
-		 * The meta object literal for the '<em><b>Width</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Width</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute BOUNDS__WIDTH = eINSTANCE.getBounds_Width();
 
 		/**
-		 * The meta object literal for the '<em><b>Height</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Height</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute BOUNDS__HEIGHT = eINSTANCE.getBounds_Height();
 
 		/**
-		 * The meta object literal for the '<em><b>Non Negative Width</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Non Negative Width</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getBounds__NonNegativeWidth__DiagnosticChain_Map();
+		EOperation BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE.getBounds__NonNegativeWidth__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '<em><b>Non Negative Height</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Non Negative Height</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getBounds__NonNegativeHeight__DiagnosticChain_Map();
+		EOperation BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getBounds__NonNegativeHeight__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dc.KnownColor <em>Known Color</em>}'
-		 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dc.KnownColor <em>Known Color</em>}' enum.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dc.KnownColor
 		 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getKnownColor()
 		 * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java
index 823ad0d6cc0..72a90128bb9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java
@@ -20,18 +20,19 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Dimension</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Dimension specifies two lengths (width and height)
- * along the x and y axes in some x-y coordinate system. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Dimension specifies two lengths (width and height) along the x and y axes in some x-y coordinate system.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dc.DCPackage#getDimension()
  * @model
  * @generated
@@ -54,12 +55,9 @@ public interface Dimension extends EObject {
 	double getWidth();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Width</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Width</em>' attribute.
 	 * @see #isSetWidth()
 	 * @see #unsetWidth()
 	 * @see #getWidth()
@@ -68,10 +66,8 @@ public interface Dimension extends EObject {
 	void setWidth(double value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetWidth()
 	 * @see #getWidth()
 	 * @see #setWidth(double)
@@ -80,10 +76,8 @@ public interface Dimension extends EObject {
 	void unsetWidth();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}'
-	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Width</em>' attribute is set.
 	 * @see #unsetWidth()
 	 * @see #getWidth()
@@ -108,12 +102,9 @@ public interface Dimension extends EObject {
 	double getHeight();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Height</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Height</em>' attribute.
 	 * @see #isSetHeight()
 	 * @see #unsetHeight()
 	 * @see #getHeight()
@@ -122,10 +113,8 @@ public interface Dimension extends EObject {
 	void setHeight(double value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetHeight()
 	 * @see #getHeight()
 	 * @see #setHeight(double)
@@ -134,10 +123,8 @@ public interface Dimension extends EObject {
 	void unsetHeight();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}'
-	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Height</em>' attribute is set.
 	 * @see #unsetHeight()
 	 * @see #getHeight()
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
index c9f01f0ed02..b08e6b71175 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
@@ -29,9 +29,9 @@ import org.eclipse.emf.common.util.Enumerator;
  */
 public enum KnownColor implements Enumerator {
 	/**
-	 * The '<em><b>Maroon</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Maroon</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #MAROON_VALUE
 	 * @generated
 	 * @ordered
@@ -39,9 +39,9 @@ public enum KnownColor implements Enumerator {
 	MAROON(0, "maroon", "#800000"),
 
 	/**
-	 * The '<em><b>Red</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Red</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #RED_VALUE
 	 * @generated
 	 * @ordered
@@ -49,9 +49,9 @@ public enum KnownColor implements Enumerator {
 	RED(1, "red", "#FF0000"),
 
 	/**
-	 * The '<em><b>Orange</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Orange</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #ORANGE_VALUE
 	 * @generated
 	 * @ordered
@@ -59,9 +59,9 @@ public enum KnownColor implements Enumerator {
 	ORANGE(2, "orange", "#FFA500"),
 
 	/**
-	 * The '<em><b>Yellow</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Yellow</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #YELLOW_VALUE
 	 * @generated
 	 * @ordered
@@ -69,9 +69,9 @@ public enum KnownColor implements Enumerator {
 	YELLOW(3, "yellow", "#FFFF00"),
 
 	/**
-	 * The '<em><b>Olive</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Olive</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #OLIVE_VALUE
 	 * @generated
 	 * @ordered
@@ -79,9 +79,9 @@ public enum KnownColor implements Enumerator {
 	OLIVE(4, "olive", "#808000"),
 
 	/**
-	 * The '<em><b>Purple</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Purple</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #PURPLE_VALUE
 	 * @generated
 	 * @ordered
@@ -89,9 +89,9 @@ public enum KnownColor implements Enumerator {
 	PURPLE(5, "purple", "#800080"),
 
 	/**
-	 * The '<em><b>Fuchsia</b></em>' literal object. <!-- begin-user-doc -->
+	 * The '<em><b>Fuchsia</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #FUCHSIA_VALUE
 	 * @generated
 	 * @ordered
@@ -99,9 +99,9 @@ public enum KnownColor implements Enumerator {
 	FUCHSIA(6, "fuchsia", "#FF00FF"),
 
 	/**
-	 * The '<em><b>White</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>White</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #WHITE_VALUE
 	 * @generated
 	 * @ordered
@@ -109,9 +109,9 @@ public enum KnownColor implements Enumerator {
 	WHITE(7, "white", "#FFFFFF"),
 
 	/**
-	 * The '<em><b>Lime</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Lime</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #LIME_VALUE
 	 * @generated
 	 * @ordered
@@ -119,9 +119,9 @@ public enum KnownColor implements Enumerator {
 	LIME(8, "lime", "#00FF00"),
 
 	/**
-	 * The '<em><b>Green</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Green</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #GREEN_VALUE
 	 * @generated
 	 * @ordered
@@ -129,9 +129,9 @@ public enum KnownColor implements Enumerator {
 	GREEN(9, "green", "#008000"),
 
 	/**
-	 * The '<em><b>Navy</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Navy</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #NAVY_VALUE
 	 * @generated
 	 * @ordered
@@ -139,9 +139,9 @@ public enum KnownColor implements Enumerator {
 	NAVY(10, "navy", "#000080"),
 
 	/**
-	 * The '<em><b>Blue</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Blue</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #BLUE_VALUE
 	 * @generated
 	 * @ordered
@@ -149,9 +149,9 @@ public enum KnownColor implements Enumerator {
 	BLUE(11, "blue", "#0000FF"),
 
 	/**
-	 * The '<em><b>Aqua</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Aqua</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #AQUA_VALUE
 	 * @generated
 	 * @ordered
@@ -159,9 +159,9 @@ public enum KnownColor implements Enumerator {
 	AQUA(12, "aqua", "#00FFFF"),
 
 	/**
-	 * The '<em><b>Teal</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Teal</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #TEAL_VALUE
 	 * @generated
 	 * @ordered
@@ -169,9 +169,9 @@ public enum KnownColor implements Enumerator {
 	TEAL(13, "teal", "#008080"),
 
 	/**
-	 * The '<em><b>Black</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Black</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #BLACK_VALUE
 	 * @generated
 	 * @ordered
@@ -179,9 +179,9 @@ public enum KnownColor implements Enumerator {
 	BLACK(14, "black", "#000000"),
 
 	/**
-	 * The '<em><b>Silver</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Silver</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #SILVER_VALUE
 	 * @generated
 	 * @ordered
@@ -189,9 +189,9 @@ public enum KnownColor implements Enumerator {
 	SILVER(15, "silver", "#C0C0C0"),
 
 	/**
-	 * The '<em><b>Gray</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Gray</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #GRAY_VALUE
 	 * @generated
 	 * @ordered
@@ -408,23 +408,36 @@ public enum KnownColor implements Enumerator {
 	 * 
 	 * @generated
 	 */
-	private static final KnownColor[] VALUES_ARRAY = new KnownColor[] { MAROON,
-			RED, ORANGE, YELLOW, OLIVE, PURPLE, FUCHSIA, WHITE, LIME, GREEN,
-			NAVY, BLUE, AQUA, TEAL, BLACK, SILVER, GRAY, };
-
-	/**
-	 * A public read-only list of all the '<em><b>Known Color</b></em>'
-	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	private static final KnownColor[] VALUES_ARRAY = new KnownColor[] {
+			MAROON,
+			RED,
+			ORANGE,
+			YELLOW,
+			OLIVE,
+			PURPLE,
+			FUCHSIA,
+			WHITE,
+			LIME,
+			GREEN,
+			NAVY,
+			BLUE,
+			AQUA,
+			TEAL,
+			BLACK,
+			SILVER,
+			GRAY,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Known Color</b></em>' enumerators.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final List<KnownColor> VALUES = Collections
-			.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+	public static final List<KnownColor> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Known Color</b></em>' literal with the specified
-	 * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the '<em><b>Known Color</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static KnownColor get(String literal) {
@@ -438,9 +451,8 @@ public enum KnownColor implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Known Color</b></em>' literal with the specified
-	 * name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the '<em><b>Known Color</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static KnownColor getByName(String name) {
@@ -454,76 +466,55 @@ public enum KnownColor implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Known Color</b></em>' literal with the specified
-	 * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the '<em><b>Known Color</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static KnownColor get(int value) {
 		switch (value) {
-		case MAROON_VALUE:
-			return MAROON;
-		case RED_VALUE:
-			return RED;
-		case ORANGE_VALUE:
-			return ORANGE;
-		case YELLOW_VALUE:
-			return YELLOW;
-		case OLIVE_VALUE:
-			return OLIVE;
-		case PURPLE_VALUE:
-			return PURPLE;
-		case FUCHSIA_VALUE:
-			return FUCHSIA;
-		case WHITE_VALUE:
-			return WHITE;
-		case LIME_VALUE:
-			return LIME;
-		case GREEN_VALUE:
-			return GREEN;
-		case NAVY_VALUE:
-			return NAVY;
-		case BLUE_VALUE:
-			return BLUE;
-		case AQUA_VALUE:
-			return AQUA;
-		case TEAL_VALUE:
-			return TEAL;
-		case BLACK_VALUE:
-			return BLACK;
-		case SILVER_VALUE:
-			return SILVER;
-		case GRAY_VALUE:
-			return GRAY;
+			case MAROON_VALUE: return MAROON;
+			case RED_VALUE: return RED;
+			case ORANGE_VALUE: return ORANGE;
+			case YELLOW_VALUE: return YELLOW;
+			case OLIVE_VALUE: return OLIVE;
+			case PURPLE_VALUE: return PURPLE;
+			case FUCHSIA_VALUE: return FUCHSIA;
+			case WHITE_VALUE: return WHITE;
+			case LIME_VALUE: return LIME;
+			case GREEN_VALUE: return GREEN;
+			case NAVY_VALUE: return NAVY;
+			case BLUE_VALUE: return BLUE;
+			case AQUA_VALUE: return AQUA;
+			case TEAL_VALUE: return TEAL;
+			case BLACK_VALUE: return BLACK;
+			case SILVER_VALUE: return SILVER;
+			case GRAY_VALUE: return GRAY;
 		}
 		return null;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private KnownColor(int value, String name, String literal) {
@@ -534,35 +525,31 @@ public enum KnownColor implements Enumerator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getValue() {
-		return value;
+	  return value;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getName() {
-		return name;
+	  return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-		return literal;
+	  return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string
-	 * representation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java
index 9fe57282508..1f14eeeac17 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java
@@ -16,18 +16,19 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Point</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> A Point specifies an location in some x-y coordinate
- * system. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * A Point specifies an location in some x-y coordinate system.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dc.DCPackage#getPoint()
  * @model
  * @generated
@@ -50,11 +51,9 @@ public interface Point extends EObject {
 	double getX();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getX
-	 * <em>X</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>X</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>X</em>' attribute.
 	 * @see #isSetX()
 	 * @see #unsetX()
 	 * @see #getX()
@@ -63,9 +62,8 @@ public interface Point extends EObject {
 	void setX(double value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getX
-	 * <em>X</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetX()
 	 * @see #getX()
 	 * @see #setX(double)
@@ -74,10 +72,8 @@ public interface Point extends EObject {
 	void unsetX();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}' attribute is
-	 * set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>X</em>' attribute is set.
 	 * @see #unsetX()
 	 * @see #getX()
@@ -102,11 +98,9 @@ public interface Point extends EObject {
 	double getY();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getY
-	 * <em>Y</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Y</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Y</em>' attribute.
 	 * @see #isSetY()
 	 * @see #unsetY()
 	 * @see #getY()
@@ -115,9 +109,8 @@ public interface Point extends EObject {
 	void setY(double value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getY
-	 * <em>Y</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetY()
 	 * @see #getY()
 	 * @see #setY(double)
@@ -126,10 +119,8 @@ public interface Point extends EObject {
 	void unsetY();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}' attribute is
-	 * set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Y</em>' attribute is set.
 	 * @see #unsetY()
 	 * @see #getY()
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java
index 67e646ed7b6..e782b9357ff 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java
@@ -37,15 +37,13 @@ import org.eclipse.papyrus.dd.dc.util.DCValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getY <em>Y</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getWidth <em>Width</em>}
- * </li>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getHeight <em>Height
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getX <em>X</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getY <em>Y</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getWidth <em>Width</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getHeight <em>Height</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
@@ -71,9 +69,9 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	protected double x = X_EDEFAULT;
 
 	/**
-	 * This is true if the X attribute has been set. <!-- begin-user-doc -->
+	 * This is true if the X attribute has been set.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -100,9 +98,9 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	protected double y = Y_EDEFAULT;
 
 	/**
-	 * This is true if the Y attribute has been set. <!-- begin-user-doc -->
+	 * This is true if the Y attribute has been set.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -111,7 +109,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	/**
 	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -121,7 +118,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	/**
 	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -129,18 +125,17 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	protected double width = WIDTH_EDEFAULT;
 
 	/**
-	 * This is true if the Width attribute has been set. <!-- begin-user-doc -->
+	 * This is true if the Width attribute has been set.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean widthESet;
 
 	/**
-	 * The default value of the '{@link #getHeight() <em>Height</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
@@ -150,7 +145,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	/**
 	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
@@ -158,9 +152,9 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	protected double height = HEIGHT_EDEFAULT;
 
 	/**
-	 * This is true if the Height attribute has been set. <!-- begin-user-doc
+	 * This is true if the Height attribute has been set.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -168,7 +162,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected BoundsImpl() {
@@ -177,7 +170,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -187,7 +179,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getX() {
@@ -196,7 +187,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setX(double newX) {
@@ -205,13 +195,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		boolean oldXESet = xESet;
 		xESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DCPackage.BOUNDS__X, oldX, x, !oldXESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__X, oldX, x, !oldXESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetX() {
@@ -220,13 +208,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		x = X_EDEFAULT;
 		xESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DCPackage.BOUNDS__X, oldX, X_EDEFAULT, oldXESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__X, oldX, X_EDEFAULT, oldXESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetX() {
@@ -235,7 +221,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getY() {
@@ -244,7 +229,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setY(double newY) {
@@ -253,13 +237,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		boolean oldYESet = yESet;
 		yESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DCPackage.BOUNDS__Y, oldY, y, !oldYESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__Y, oldY, y, !oldYESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetY() {
@@ -268,13 +250,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		y = Y_EDEFAULT;
 		yESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DCPackage.BOUNDS__Y, oldY, Y_EDEFAULT, oldYESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__Y, oldY, Y_EDEFAULT, oldYESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetY() {
@@ -283,7 +263,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getWidth() {
@@ -292,7 +271,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setWidth(double newWidth) {
@@ -301,13 +279,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		boolean oldWidthESet = widthESet;
 		widthESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DCPackage.BOUNDS__WIDTH, oldWidth, width, !oldWidthESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__WIDTH, oldWidth, width, !oldWidthESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetWidth() {
@@ -316,14 +292,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		width = WIDTH_EDEFAULT;
 		widthESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DCPackage.BOUNDS__WIDTH, oldWidth, WIDTH_EDEFAULT,
-					oldWidthESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__WIDTH, oldWidth, WIDTH_EDEFAULT, oldWidthESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetWidth() {
@@ -332,7 +305,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getHeight() {
@@ -341,7 +313,6 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setHeight(double newHeight) {
@@ -350,13 +321,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		boolean oldHeightESet = heightESet;
 		heightESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DCPackage.BOUNDS__HEIGHT, oldHeight, height, !oldHeightESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__HEIGHT, oldHeight, height, !oldHeightESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetHeight() {
@@ -365,14 +334,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		height = HEIGHT_EDEFAULT;
 		heightESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DCPackage.BOUNDS__HEIGHT, oldHeight, HEIGHT_EDEFAULT,
-					oldHeightESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__HEIGHT, oldHeight, HEIGHT_EDEFAULT, oldHeightESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetHeight() {
@@ -380,13 +346,10 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Non Negative Width</em>}' invariant operation. <!-- begin-user-doc
+	 * The cached validation expression for the '{@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Width</em>}' invariant operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -394,32 +357,29 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean nonNegativeWidth(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DCValidator
-				.validate(
-						DCPackage.Literals.BOUNDS,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DCPackage.Literals.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP,
-						NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE,
-						DCValidator.BOUNDS__NON_NEGATIVE_WIDTH);
+		return
+			DCValidator.validate
+				(DCPackage.Literals.BOUNDS,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DCPackage.Literals.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP,
+				 NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DCValidator.DIAGNOSTIC_SOURCE,
+				 DCValidator.BOUNDS__NON_NEGATIVE_WIDTH);
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Non Negative Height</em>}' invariant operation. <!-- begin-user-doc
+	 * The cached validation expression for the '{@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Height</em>}' invariant operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -427,115 +387,110 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean nonNegativeHeight(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DCValidator
-				.validate(
-						DCPackage.Literals.BOUNDS,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DCPackage.Literals.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP,
-						NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE,
-						DCValidator.BOUNDS__NON_NEGATIVE_HEIGHT);
+		return
+			DCValidator.validate
+				(DCPackage.Literals.BOUNDS,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DCPackage.Literals.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP,
+				 NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DCValidator.DIAGNOSTIC_SOURCE,
+				 DCValidator.BOUNDS__NON_NEGATIVE_HEIGHT);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DCPackage.BOUNDS__X:
-			return getX();
-		case DCPackage.BOUNDS__Y:
-			return getY();
-		case DCPackage.BOUNDS__WIDTH:
-			return getWidth();
-		case DCPackage.BOUNDS__HEIGHT:
-			return getHeight();
+			case DCPackage.BOUNDS__X:
+				return getX();
+			case DCPackage.BOUNDS__Y:
+				return getY();
+			case DCPackage.BOUNDS__WIDTH:
+				return getWidth();
+			case DCPackage.BOUNDS__HEIGHT:
+				return getHeight();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DCPackage.BOUNDS__X:
-			setX((Double) newValue);
-			return;
-		case DCPackage.BOUNDS__Y:
-			setY((Double) newValue);
-			return;
-		case DCPackage.BOUNDS__WIDTH:
-			setWidth((Double) newValue);
-			return;
-		case DCPackage.BOUNDS__HEIGHT:
-			setHeight((Double) newValue);
-			return;
+			case DCPackage.BOUNDS__X:
+				setX((Double)newValue);
+				return;
+			case DCPackage.BOUNDS__Y:
+				setY((Double)newValue);
+				return;
+			case DCPackage.BOUNDS__WIDTH:
+				setWidth((Double)newValue);
+				return;
+			case DCPackage.BOUNDS__HEIGHT:
+				setHeight((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DCPackage.BOUNDS__X:
-			unsetX();
-			return;
-		case DCPackage.BOUNDS__Y:
-			unsetY();
-			return;
-		case DCPackage.BOUNDS__WIDTH:
-			unsetWidth();
-			return;
-		case DCPackage.BOUNDS__HEIGHT:
-			unsetHeight();
-			return;
+			case DCPackage.BOUNDS__X:
+				unsetX();
+				return;
+			case DCPackage.BOUNDS__Y:
+				unsetY();
+				return;
+			case DCPackage.BOUNDS__WIDTH:
+				unsetWidth();
+				return;
+			case DCPackage.BOUNDS__HEIGHT:
+				unsetHeight();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DCPackage.BOUNDS__X:
-			return isSetX();
-		case DCPackage.BOUNDS__Y:
-			return isSetY();
-		case DCPackage.BOUNDS__WIDTH:
-			return isSetWidth();
-		case DCPackage.BOUNDS__HEIGHT:
-			return isSetHeight();
+			case DCPackage.BOUNDS__X:
+				return isSetX();
+			case DCPackage.BOUNDS__Y:
+				return isSetY();
+			case DCPackage.BOUNDS__WIDTH:
+				return isSetWidth();
+			case DCPackage.BOUNDS__HEIGHT:
+				return isSetHeight();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -543,47 +498,31 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DCPackage.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
-			return nonNegativeWidth((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
-		case DCPackage.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
-			return nonNegativeHeight((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DCPackage.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
+				return nonNegativeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+			case DCPackage.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
+				return nonNegativeHeight((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (x: ");
-		if (xESet)
-			result.append(x);
-		else
-			result.append("<unset>");
+		if (xESet) result.append(x); else result.append("<unset>");
 		result.append(", y: ");
-		if (yESet)
-			result.append(y);
-		else
-			result.append("<unset>");
+		if (yESet) result.append(y); else result.append("<unset>");
 		result.append(", width: ");
-		if (widthESet)
-			result.append(width);
-		else
-			result.append("<unset>");
+		if (widthESet) result.append(width); else result.append("<unset>");
 		result.append(", height: ");
-		if (heightESet)
-			result.append(height);
-		else
-			result.append("<unset>");
+		if (heightESet) result.append(height); else result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java
index 6ff06341132..f956501aad9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java
@@ -27,34 +27,33 @@ import org.eclipse.papyrus.dd.dc.*;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
  * end-user-doc -->
- * 
  * @generated
  */
 public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
-	 * Creates the default factory implementation. <!-- begin-user-doc --> <!--
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static DCFactory init() {
 		try {
-			DCFactory theDCFactory = (DCFactory) EPackage.Registry.INSTANCE
-					.getEFactory(DCPackage.eNS_URI);
+			DCFactory theDCFactory = (DCFactory)EPackage.Registry.INSTANCE.getEFactory(DCPackage.eNS_URI);
 			if (theDCFactory != null) {
 				return theDCFactory;
 			}
-		} catch (Exception exception) {
+		}
+		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new DCFactoryImpl();
 	}
 
 	/**
-	 * Creates an instance of the factory. <!-- begin-user-doc --> <!--
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DCFactoryImpl() {
@@ -63,79 +62,69 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-		case DCPackage.POINT:
-			return createPoint();
-		case DCPackage.DIMENSION:
-			return createDimension();
-		case DCPackage.BOUNDS:
-			return createBounds();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName()
-					+ "' is not a valid classifier");
+			case DCPackage.POINT: return createPoint();
+			case DCPackage.DIMENSION: return createDimension();
+			case DCPackage.BOUNDS: return createBounds();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-		case DCPackage.KNOWN_COLOR:
-			return createKnownColorFromString(eDataType, initialValue);
-		case DCPackage.BOOLEAN:
-			return createBooleanFromString(eDataType, initialValue);
-		case DCPackage.INTEGER:
-			return createIntegerFromString(eDataType, initialValue);
-		case DCPackage.REAL:
-			return createRealFromString(eDataType, initialValue);
-		case DCPackage.STRING:
-			return createStringFromString(eDataType, initialValue);
-		case DCPackage.COLOR:
-			return createColorFromString(eDataType, initialValue);
-		default:
-			throw new IllegalArgumentException("The datatype '"
-					+ eDataType.getName() + "' is not a valid classifier");
+			case DCPackage.KNOWN_COLOR:
+				return createKnownColorFromString(eDataType, initialValue);
+			case DCPackage.BOOLEAN:
+				return createBooleanFromString(eDataType, initialValue);
+			case DCPackage.INTEGER:
+				return createIntegerFromString(eDataType, initialValue);
+			case DCPackage.REAL:
+				return createRealFromString(eDataType, initialValue);
+			case DCPackage.STRING:
+				return createStringFromString(eDataType, initialValue);
+			case DCPackage.COLOR:
+				return createColorFromString(eDataType, initialValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
-		case DCPackage.KNOWN_COLOR:
-			return convertKnownColorToString(eDataType, instanceValue);
-		case DCPackage.BOOLEAN:
-			return convertBooleanToString(eDataType, instanceValue);
-		case DCPackage.INTEGER:
-			return convertIntegerToString(eDataType, instanceValue);
-		case DCPackage.REAL:
-			return convertRealToString(eDataType, instanceValue);
-		case DCPackage.STRING:
-			return convertStringToString(eDataType, instanceValue);
-		case DCPackage.COLOR:
-			return convertColorToString(eDataType, instanceValue);
-		default:
-			throw new IllegalArgumentException("The datatype '"
-					+ eDataType.getName() + "' is not a valid classifier");
+			case DCPackage.KNOWN_COLOR:
+				return convertKnownColorToString(eDataType, instanceValue);
+			case DCPackage.BOOLEAN:
+				return convertBooleanToString(eDataType, instanceValue);
+			case DCPackage.INTEGER:
+				return convertIntegerToString(eDataType, instanceValue);
+			case DCPackage.REAL:
+				return convertRealToString(eDataType, instanceValue);
+			case DCPackage.STRING:
+				return convertStringToString(eDataType, instanceValue);
+			case DCPackage.COLOR:
+				return convertColorToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point createPoint() {
@@ -145,7 +134,6 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Dimension createDimension() {
@@ -155,7 +143,6 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Bounds createBounds() {
@@ -165,22 +152,17 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public KnownColor createKnownColorFromString(EDataType eDataType,
 			String initialValue) {
 		KnownColor result = KnownColor.get(initialValue);
-		if (result == null)
-			throw new IllegalArgumentException("The value '" + initialValue
-					+ "' is not a valid enumerator of '" + eDataType.getName()
-					+ "'");
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String convertKnownColorToString(EDataType eDataType,
@@ -190,17 +172,15 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Boolean createBooleanFromString(EDataType eDataType,
 			String initialValue) {
-		return (Boolean) super.createFromString(eDataType, initialValue);
+		return (Boolean)super.createFromString(eDataType, initialValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String convertBooleanToString(EDataType eDataType,
@@ -210,17 +190,15 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Integer createIntegerFromString(EDataType eDataType,
 			String initialValue) {
-		return (Integer) super.createFromString(eDataType, initialValue);
+		return (Integer)super.createFromString(eDataType, initialValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String convertIntegerToString(EDataType eDataType,
@@ -230,16 +208,14 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Double createRealFromString(EDataType eDataType, String initialValue) {
-		return (Double) super.createFromString(eDataType, initialValue);
+		return (Double)super.createFromString(eDataType, initialValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String convertRealToString(EDataType eDataType, Object instanceValue) {
@@ -248,17 +224,15 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String createStringFromString(EDataType eDataType,
 			String initialValue) {
-		return (String) super.createFromString(eDataType, initialValue);
+		return (String)super.createFromString(eDataType, initialValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String convertStringToString(EDataType eDataType,
@@ -292,16 +266,14 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DCPackage getDCPackage() {
-		return (DCPackage) getEPackage();
+		return (DCPackage)getEPackage();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @deprecated
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java
index e57dfb25151..43cc688b7c1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java
@@ -32,70 +32,60 @@ import org.eclipse.papyrus.dd.dc.util.DCValidator;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
  * end-user-doc -->
- * 
  * @generated
  */
 public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass pointEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass dimensionEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass boundsEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EEnum knownColorEEnum = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EDataType booleanEDataType = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EDataType integerEDataType = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EDataType realEDataType = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EDataType stringEDataType = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EDataType colorEDataType = null;
@@ -121,7 +111,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -142,14 +131,10 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 * @generated
 	 */
 	public static DCPackage init() {
-		if (isInited)
-			return (DCPackage) EPackage.Registry.INSTANCE
-					.getEPackage(DCPackage.eNS_URI);
+		if (isInited) return (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
 
 		// Obtain or create and register package
-		DCPackageImpl theDCPackage = (DCPackageImpl) (EPackage.Registry.INSTANCE
-				.get(eNS_URI) instanceof DCPackageImpl ? EPackage.Registry.INSTANCE
-				.get(eNS_URI) : new DCPackageImpl());
+		DCPackageImpl theDCPackage = (DCPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DCPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DCPackageImpl());
 
 		isInited = true;
 
@@ -160,16 +145,18 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		theDCPackage.initializePackageContents();
 
 		// Register package validator
-		EValidator.Registry.INSTANCE.put(theDCPackage,
-				new EValidator.Descriptor() {
-					public EValidator getEValidator() {
-						return DCValidator.INSTANCE;
-					}
-				});
+		EValidator.Registry.INSTANCE.put
+			(theDCPackage, 
+			 new EValidator.Descriptor() {
+				 public EValidator getEValidator() {
+					 return DCValidator.INSTANCE;
+				 }
+			 });
 
 		// Mark meta-data to indicate it can't be changed
 		theDCPackage.freeze();
 
+  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(DCPackage.eNS_URI, theDCPackage);
 		return theDCPackage;
@@ -177,7 +164,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getPoint() {
@@ -186,25 +172,22 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getPoint_X() {
-		return (EAttribute) pointEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)pointEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getPoint_Y() {
-		return (EAttribute) pointEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)pointEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getDimension() {
@@ -213,25 +196,22 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getDimension_Width() {
-		return (EAttribute) dimensionEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)dimensionEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getDimension_Height() {
-		return (EAttribute) dimensionEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)dimensionEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getDimension__NonNegativeWidth__DiagnosticChain_Map() {
@@ -240,7 +220,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getDimension__NonNegativeHeight__DiagnosticChain_Map() {
@@ -249,7 +228,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getBounds() {
@@ -258,43 +236,38 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getBounds_X() {
-		return (EAttribute) boundsEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)boundsEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getBounds_Y() {
-		return (EAttribute) boundsEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)boundsEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getBounds_Width() {
-		return (EAttribute) boundsEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)boundsEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getBounds_Height() {
-		return (EAttribute) boundsEClass.getEStructuralFeatures().get(3);
+		return (EAttribute)boundsEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getBounds__NonNegativeWidth__DiagnosticChain_Map() {
@@ -303,7 +276,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getBounds__NonNegativeHeight__DiagnosticChain_Map() {
@@ -312,7 +284,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EEnum getKnownColor() {
@@ -321,7 +292,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EDataType getBoolean() {
@@ -330,7 +300,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EDataType getInteger() {
@@ -339,7 +308,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EDataType getReal() {
@@ -348,7 +316,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EDataType getString() {
@@ -357,7 +324,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EDataType getColor() {
@@ -366,30 +332,27 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DCFactory getDCFactory() {
-		return (DCFactory) getEFactoryInstance();
+		return (DCFactory)getEFactoryInstance();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package. This method is guarded to
-	 * have no affect on any invocation but its first. <!-- begin-user-doc -->
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated)
-			return;
+		if (isCreated) return;
 		isCreated = true;
 
 		// Create classes and their features
@@ -400,20 +363,16 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		dimensionEClass = createEClass(DIMENSION);
 		createEAttribute(dimensionEClass, DIMENSION__WIDTH);
 		createEAttribute(dimensionEClass, DIMENSION__HEIGHT);
-		createEOperation(dimensionEClass,
-				DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP);
-		createEOperation(dimensionEClass,
-				DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP);
+		createEOperation(dimensionEClass, DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP);
+		createEOperation(dimensionEClass, DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP);
 
 		boundsEClass = createEClass(BOUNDS);
 		createEAttribute(boundsEClass, BOUNDS__X);
 		createEAttribute(boundsEClass, BOUNDS__Y);
 		createEAttribute(boundsEClass, BOUNDS__WIDTH);
 		createEAttribute(boundsEClass, BOUNDS__HEIGHT);
-		createEOperation(boundsEClass,
-				BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP);
-		createEOperation(boundsEClass,
-				BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP);
+		createEOperation(boundsEClass, BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP);
+		createEOperation(boundsEClass, BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP);
 
 		// Create enums
 		knownColorEEnum = createEEnum(KNOWN_COLOR);
@@ -428,7 +387,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -441,8 +399,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized)
-			return;
+		if (isInitialized) return;
 		isInitialized = true;
 
 		// Initialize package
@@ -457,30 +414,16 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		// Add supertypes to classes
 
 		// Initialize classes, features, and operations; add parameters
-		initEClass(pointEClass, Point.class, "Point", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPoint_X(), this.getReal(), "x", "0", 0, 1,
-				Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getPoint_Y(), this.getReal(), "y", "0", 0, 1,
-				Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(dimensionEClass, Dimension.class, "Dimension", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDimension_Width(), this.getReal(), "width", "0", 0,
-				1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getDimension_Height(), this.getReal(), "height", "0", 0,
-				1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		EOperation op = initEOperation(
-				getDimension__NonNegativeWidth__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "nonNegativeWidth", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(pointEClass, Point.class, "Point", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPoint_X(), this.getReal(), "x", "0", 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getPoint_Y(), this.getReal(), "y", "0", 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(dimensionEClass, Dimension.class, "Dimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDimension_Width(), this.getReal(), "width", "0", 0, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getDimension_Height(), this.getReal(), "height", "0", 0, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		EOperation op = initEOperation(getDimension__NonNegativeWidth__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeWidth", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		EGenericType g1 = createEGenericType(ecorePackage.getEMap());
 		EGenericType g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -488,12 +431,8 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		op = initEOperation(
-				getDimension__NonNegativeHeight__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "nonNegativeHeight", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		op = initEOperation(getDimension__NonNegativeHeight__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeHeight", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -501,26 +440,14 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(boundsEClass, Bounds.class, "Bounds", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBounds_X(), this.getReal(), "x", "0", 0, 1,
-				Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getBounds_Y(), this.getReal(), "y", "0", 0, 1,
-				Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getBounds_Width(), this.getReal(), "width", "0", 0, 1,
-				Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getBounds_Height(), this.getReal(), "height", "0", 0, 1,
-				Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		op = initEOperation(getBounds__NonNegativeWidth__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "nonNegativeWidth", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(boundsEClass, Bounds.class, "Bounds", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getBounds_X(), this.getReal(), "x", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getBounds_Y(), this.getReal(), "y", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getBounds_Width(), this.getReal(), "width", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getBounds_Height(), this.getReal(), "height", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getBounds__NonNegativeWidth__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeWidth", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -528,12 +455,8 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		op = initEOperation(
-				getBounds__NonNegativeHeight__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "nonNegativeHeight", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		op = initEOperation(getBounds__NonNegativeHeight__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeHeight", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -562,16 +485,11 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		addEEnumLiteral(knownColorEEnum, KnownColor.GRAY);
 
 		// Initialize data types
-		initEDataType(booleanEDataType, boolean.class, "Boolean",
-				IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(integerEDataType, int.class, "Integer", IS_SERIALIZABLE,
-				!IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(realEDataType, double.class, "Real", IS_SERIALIZABLE,
-				!IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(stringEDataType, String.class, "String", IS_SERIALIZABLE,
-				!IS_GENERATED_INSTANCE_CLASS);
-		initEDataType(colorEDataType, Color.class, "Color", IS_SERIALIZABLE,
-				!IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(booleanEDataType, boolean.class, "Boolean", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(integerEDataType, int.class, "Integer", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(realEDataType, double.class, "Real", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(stringEDataType, String.class, "String", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
+		initEDataType(colorEDataType, Color.class, "Color", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 
 		// Create resource
 		createResource(eNS_URI);
@@ -584,35 +502,53 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	}
 
 	/**
-	 * Initializes the annotations for
-	 * <b>http://www.eclipse.org/emf/2002/Ecore</b>. <!-- begin-user-doc -->
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected void createEcoreAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore";
-		addAnnotation(this, source, new String[] { "validationDelegates",
-				"http://www.eclipse.org/emf/2002/Ecore/OCL" });
+		String source = "http://www.eclipse.org/emf/2002/Ecore";			
+		addAnnotation
+		  (this, 
+		   source, 
+		   new String[] {
+			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL"
+		   });																																																		
 	}
 
 	/**
-	 * Initializes the annotations for
-	 * <b>http://www.eclipse.org/emf/2002/Ecore/OCL</b>. <!-- begin-user-doc -->
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL</b>.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected void createOCLAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";
-		addAnnotation(getDimension__NonNegativeWidth__DiagnosticChain_Map(),
-				source, new String[] { "body", "width >=0" });
-		addAnnotation(getDimension__NonNegativeHeight__DiagnosticChain_Map(),
-				source, new String[] { "body", "height >=0" });
-		addAnnotation(getBounds__NonNegativeWidth__DiagnosticChain_Map(),
-				source, new String[] { "body", "width >= 0" });
-		addAnnotation(getBounds__NonNegativeHeight__DiagnosticChain_Map(),
-				source, new String[] { "body", "height >=0" });
+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";																															
+		addAnnotation
+		  (getDimension__NonNegativeWidth__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "width >=0"
+		   });					
+		addAnnotation
+		  (getDimension__NonNegativeHeight__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "height >=0"
+		   });								
+		addAnnotation
+		  (getBounds__NonNegativeWidth__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "width >= 0"
+		   });					
+		addAnnotation
+		  (getBounds__NonNegativeHeight__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "height >=0"
+		   });							
 	}
 
 } // DCPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java
index 4dd581619b6..d80e6927294 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java
@@ -37,13 +37,11 @@ import org.eclipse.papyrus.dd.dc.util.DCValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl#getWidth <em>Width
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl#getHeight <em>Height
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl#getWidth <em>Width</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl#getHeight <em>Height</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class DimensionImpl extends MinimalEObjectImpl.Container implements
@@ -52,7 +50,6 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -62,7 +59,6 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -70,18 +66,17 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	protected double width = WIDTH_EDEFAULT;
 
 	/**
-	 * This is true if the Width attribute has been set. <!-- begin-user-doc -->
+	 * This is true if the Width attribute has been set.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean widthESet;
 
 	/**
-	 * The default value of the '{@link #getHeight() <em>Height</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
@@ -91,7 +86,6 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
@@ -99,9 +93,9 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	protected double height = HEIGHT_EDEFAULT;
 
 	/**
-	 * This is true if the Height attribute has been set. <!-- begin-user-doc
+	 * This is true if the Height attribute has been set.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -109,7 +103,6 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected DimensionImpl() {
@@ -118,7 +111,6 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,7 +120,6 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getWidth() {
@@ -137,7 +128,6 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setWidth(double newWidth) {
@@ -146,13 +136,11 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 		boolean oldWidthESet = widthESet;
 		widthESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DCPackage.DIMENSION__WIDTH, oldWidth, width, !oldWidthESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.DIMENSION__WIDTH, oldWidth, width, !oldWidthESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetWidth() {
@@ -161,14 +149,11 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 		width = WIDTH_EDEFAULT;
 		widthESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DCPackage.DIMENSION__WIDTH, oldWidth, WIDTH_EDEFAULT,
-					oldWidthESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.DIMENSION__WIDTH, oldWidth, WIDTH_EDEFAULT, oldWidthESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetWidth() {
@@ -177,7 +162,6 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getHeight() {
@@ -186,7 +170,6 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setHeight(double newHeight) {
@@ -195,14 +178,11 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 		boolean oldHeightESet = heightESet;
 		heightESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DCPackage.DIMENSION__HEIGHT, oldHeight, height,
-					!oldHeightESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.DIMENSION__HEIGHT, oldHeight, height, !oldHeightESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetHeight() {
@@ -211,14 +191,11 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 		height = HEIGHT_EDEFAULT;
 		heightESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DCPackage.DIMENSION__HEIGHT, oldHeight, HEIGHT_EDEFAULT,
-					oldHeightESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.DIMENSION__HEIGHT, oldHeight, HEIGHT_EDEFAULT, oldHeightESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetHeight() {
@@ -226,13 +203,10 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Non Negative Width</em>}' invariant operation. <!-- begin-user-doc
+	 * The cached validation expression for the '{@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Width</em>}' invariant operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -240,32 +214,29 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean nonNegativeWidth(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DCValidator
-				.validate(
-						DCPackage.Literals.DIMENSION,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DCPackage.Literals.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP,
-						NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE,
-						DCValidator.DIMENSION__NON_NEGATIVE_WIDTH);
+		return
+			DCValidator.validate
+				(DCPackage.Literals.DIMENSION,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DCPackage.Literals.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP,
+				 NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DCValidator.DIAGNOSTIC_SOURCE,
+				 DCValidator.DIMENSION__NON_NEGATIVE_WIDTH);
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Non Negative Height</em>}' invariant operation. <!-- begin-user-doc
+	 * The cached validation expression for the '{@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Height</em>}' invariant operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -273,95 +244,90 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean nonNegativeHeight(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DCValidator
-				.validate(
-						DCPackage.Literals.DIMENSION,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DCPackage.Literals.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP,
-						NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE,
-						DCValidator.DIMENSION__NON_NEGATIVE_HEIGHT);
+		return
+			DCValidator.validate
+				(DCPackage.Literals.DIMENSION,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DCPackage.Literals.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP,
+				 NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DCValidator.DIAGNOSTIC_SOURCE,
+				 DCValidator.DIMENSION__NON_NEGATIVE_HEIGHT);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DCPackage.DIMENSION__WIDTH:
-			return getWidth();
-		case DCPackage.DIMENSION__HEIGHT:
-			return getHeight();
+			case DCPackage.DIMENSION__WIDTH:
+				return getWidth();
+			case DCPackage.DIMENSION__HEIGHT:
+				return getHeight();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DCPackage.DIMENSION__WIDTH:
-			setWidth((Double) newValue);
-			return;
-		case DCPackage.DIMENSION__HEIGHT:
-			setHeight((Double) newValue);
-			return;
+			case DCPackage.DIMENSION__WIDTH:
+				setWidth((Double)newValue);
+				return;
+			case DCPackage.DIMENSION__HEIGHT:
+				setHeight((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DCPackage.DIMENSION__WIDTH:
-			unsetWidth();
-			return;
-		case DCPackage.DIMENSION__HEIGHT:
-			unsetHeight();
-			return;
+			case DCPackage.DIMENSION__WIDTH:
+				unsetWidth();
+				return;
+			case DCPackage.DIMENSION__HEIGHT:
+				unsetHeight();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DCPackage.DIMENSION__WIDTH:
-			return isSetWidth();
-		case DCPackage.DIMENSION__HEIGHT:
-			return isSetHeight();
+			case DCPackage.DIMENSION__WIDTH:
+				return isSetWidth();
+			case DCPackage.DIMENSION__HEIGHT:
+				return isSetHeight();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -369,37 +335,27 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DCPackage.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
-			return nonNegativeWidth((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
-		case DCPackage.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
-			return nonNegativeHeight((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DCPackage.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
+				return nonNegativeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+			case DCPackage.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
+				return nonNegativeHeight((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (width: ");
-		if (widthESet)
-			result.append(width);
-		else
-			result.append("<unset>");
+		if (widthESet) result.append(width); else result.append("<unset>");
 		result.append(", height: ");
-		if (heightESet)
-			result.append(height);
-		else
-			result.append("<unset>");
+		if (heightESet) result.append(height); else result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java
index 489fb62de81..7fe2c4b2d05 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java
@@ -27,11 +27,11 @@ import org.eclipse.papyrus.dd.dc.Point;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.PointImpl#getX <em>X</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dc.impl.PointImpl#getY <em>Y</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.impl.PointImpl#getX <em>X</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dc.impl.PointImpl#getY <em>Y</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class PointImpl extends MinimalEObjectImpl.Container implements Point {
@@ -57,9 +57,9 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 	protected double x = X_EDEFAULT;
 
 	/**
-	 * This is true if the X attribute has been set. <!-- begin-user-doc -->
+	 * This is true if the X attribute has been set.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -86,9 +86,9 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 	protected double y = Y_EDEFAULT;
 
 	/**
-	 * This is true if the Y attribute has been set. <!-- begin-user-doc -->
+	 * This is true if the Y attribute has been set.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -96,7 +96,6 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected PointImpl() {
@@ -105,7 +104,6 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -115,7 +113,6 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getX() {
@@ -124,7 +121,6 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setX(double newX) {
@@ -133,13 +129,11 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 		boolean oldXESet = xESet;
 		xESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DCPackage.POINT__X, oldX, x, !oldXESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.POINT__X, oldX, x, !oldXESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetX() {
@@ -148,13 +142,11 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 		x = X_EDEFAULT;
 		xESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DCPackage.POINT__X, oldX, X_EDEFAULT, oldXESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.POINT__X, oldX, X_EDEFAULT, oldXESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetX() {
@@ -163,7 +155,6 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getY() {
@@ -172,7 +163,6 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setY(double newY) {
@@ -181,13 +171,11 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 		boolean oldYESet = yESet;
 		yESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DCPackage.POINT__Y, oldY, y, !oldYESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.POINT__Y, oldY, y, !oldYESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetY() {
@@ -196,13 +184,11 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 		y = Y_EDEFAULT;
 		yESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DCPackage.POINT__Y, oldY, Y_EDEFAULT, oldYESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.POINT__Y, oldY, Y_EDEFAULT, oldYESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetY() {
@@ -211,93 +197,81 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DCPackage.POINT__X:
-			return getX();
-		case DCPackage.POINT__Y:
-			return getY();
+			case DCPackage.POINT__X:
+				return getX();
+			case DCPackage.POINT__Y:
+				return getY();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DCPackage.POINT__X:
-			setX((Double) newValue);
-			return;
-		case DCPackage.POINT__Y:
-			setY((Double) newValue);
-			return;
+			case DCPackage.POINT__X:
+				setX((Double)newValue);
+				return;
+			case DCPackage.POINT__Y:
+				setY((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DCPackage.POINT__X:
-			unsetX();
-			return;
-		case DCPackage.POINT__Y:
-			unsetY();
-			return;
+			case DCPackage.POINT__X:
+				unsetX();
+				return;
+			case DCPackage.POINT__Y:
+				unsetY();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DCPackage.POINT__X:
-			return isSetX();
-		case DCPackage.POINT__Y:
-			return isSetY();
+			case DCPackage.POINT__X:
+				return isSetX();
+			case DCPackage.POINT__Y:
+				return isSetY();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (x: ");
-		if (xESet)
-			result.append(x);
-		else
-			result.append("<unset>");
+		if (xESet) result.append(x); else result.append("<unset>");
 		result.append(", y: ");
-		if (yESet)
-			result.append(y);
-		else
-			result.append("<unset>");
+		if (yESet) result.append(y); else result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java
index b225359f91c..d971ef4cdf5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java
@@ -24,23 +24,22 @@ import org.eclipse.papyrus.dd.dc.*;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
  * an adapter <code>createXXX</code> method for each class of the model. <!--
  * end-user-doc -->
- * 
  * @see org.eclipse.papyrus.dd.dc.DCPackage
  * @generated
  */
 public class DCAdapterFactory extends AdapterFactoryImpl {
 
 	/**
-	 * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached model package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected static DCPackage modelPackage;
 
 	/**
-	 * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DCAdapterFactory() {
@@ -54,7 +53,6 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if
 	 * the object is either the model's package or is an instance object of the
 	 * model. <!-- end-user-doc -->
-	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -64,7 +62,7 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 			return true;
 		}
 		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
@@ -76,39 +74,35 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	 * @generated
 	 */
 	protected DCSwitch<Adapter> modelSwitch = new DCSwitch<Adapter>() {
-		@Override
-		public Adapter casePoint(Point object) {
-			return createPointAdapter();
-		}
-
-		@Override
-		public Adapter caseDimension(Dimension object) {
-			return createDimensionAdapter();
-		}
-
-		@Override
-		public Adapter caseBounds(Bounds object) {
-			return createBoundsAdapter();
-		}
-
-		@Override
-		public Adapter defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
+			@Override
+			public Adapter casePoint(Point object) {
+				return createPointAdapter();
+			}
+			@Override
+			public Adapter caseDimension(Dimension object) {
+				return createDimensionAdapter();
+			}
+			@Override
+			public Adapter caseBounds(Bounds object) {
+				return createBoundsAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
 
 	/**
-	 * Creates an adapter for the <code>target</code>. <!-- begin-user-doc -->
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param target
-	 *            the object to adapt.
+	 * @param target the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
+		return modelSwitch.doSwitch((EObject)target);
 	}
 
 	/**
@@ -157,9 +151,9 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for the default case. <!-- begin-user-doc --> This
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc --> This
 	 * default implementation returns null. <!-- end-user-doc -->
-	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java
index ff95308cc47..b935c7caaf3 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java
@@ -25,23 +25,22 @@ import org.eclipse.papyrus.dd.dc.*;
  * starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the
  * result of the switch. <!-- end-user-doc -->
- * 
  * @see org.eclipse.papyrus.dd.dc.DCPackage
  * @generated
  */
 public class DCSwitch<T> extends Switch<T> {
 
 	/**
-	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached model package
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected static DCPackage modelPackage;
 
 	/**
-	 * Creates an instance of the switch. <!-- begin-user-doc --> <!--
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DCSwitch() {
@@ -64,53 +63,44 @@ public class DCSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns
-	 * a non null result; it yields that result. <!-- begin-user-doc --> <!--
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return the first non-null result returned by a <code>caseXXX</code>
-	 *         call.
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-		case DCPackage.POINT: {
-			Point point = (Point) theEObject;
-			T result = casePoint(point);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DCPackage.DIMENSION: {
-			Dimension dimension = (Dimension) theEObject;
-			T result = caseDimension(dimension);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DCPackage.BOUNDS: {
-			Bounds bounds = (Bounds) theEObject;
-			T result = caseBounds(bounds);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
+			case DCPackage.POINT: {
+				Point point = (Point)theEObject;
+				T result = casePoint(point);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DCPackage.DIMENSION: {
+				Dimension dimension = (Dimension)theEObject;
+				T result = caseDimension(dimension);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DCPackage.BOUNDS: {
+				Bounds bounds = (Bounds)theEObject;
+				T result = caseBounds(bounds);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
 		}
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Point</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Point</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>Point</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Point</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -119,15 +109,12 @@ public class DCSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Dimension</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Dimension</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>Dimension</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Dimension</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -136,15 +123,12 @@ public class DCSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Bounds</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Bounds</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>Bounds</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Bounds</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -153,15 +137,12 @@ public class DCSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>EObject</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch, but this is
 	 * the last case anyway. <!-- end-user-doc -->
-	 * 
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '
-	 *         <em>EObject</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java
index 2a3ccfc2a6f..b0d99890cd8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java
@@ -37,18 +37,15 @@ import org.eclipse.papyrus.dd.dc.*;
 public class DCValidator extends EObjectValidator {
 
 	/**
-	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached model package
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static final DCValidator INSTANCE = new DCValidator();
 
 	/**
-	 * A constant for the
-	 * {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of
-	 * diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes}
-	 * from this package. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
 	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
 	 * @generated
@@ -56,78 +53,69 @@ public class DCValidator extends EObjectValidator {
 	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.dd.dc";
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Non Negative Width' of 'Dimension'. <!-- begin-user-doc -->
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Non Negative Width' of 'Dimension'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int DIMENSION__NON_NEGATIVE_WIDTH = 1;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Non Negative Height' of 'Dimension'. <!-- begin-user-doc -->
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Non Negative Height' of 'Dimension'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int DIMENSION__NON_NEGATIVE_HEIGHT = 2;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Non Negative Width' of 'Bounds'. <!-- begin-user-doc --> <!--
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Non Negative Width' of 'Bounds'.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int BOUNDS__NON_NEGATIVE_WIDTH = 3;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Non Negative Height' of 'Bounds'. <!-- begin-user-doc -->
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Non Negative Height' of 'Bounds'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int BOUNDS__NON_NEGATIVE_HEIGHT = 4;
 
 	/**
-	 * A constant with a fixed name that can be used as the base value for
-	 * additional hand written constants. <!-- begin-user-doc --> <!--
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 4;
 
 	/**
-	 * A constant with a fixed name that can be used as the base value for
-	 * additional hand written constants in a derived class. <!-- begin-user-doc
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
 
 	/**
-	 * Delegates evaluation of the given invariant expression against the object
-	 * in the given context. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Delegates evaluation of the given invariant expression against the object in the given context.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static boolean validate(EClass eClass, EObject eObject,
 			DiagnosticChain diagnostics, Map<Object, Object> context,
 			String validationDelegate, EOperation invariant, String expression,
 			int severity, String source, int code) {
-		return EObjectValidator.validate(eClass, eObject, diagnostics, context,
-				validationDelegate, invariant, expression, severity, source,
-				code);
+		return EObjectValidator.validate(eClass, eObject, diagnostics, context, validationDelegate, invariant, expression, severity, source, code);
 	}
 
 	/**
-	 * Creates an instance of the switch. <!-- begin-user-doc --> <!--
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DCValidator() {
@@ -135,52 +123,50 @@ public class DCValidator extends EObjectValidator {
 	}
 
 	/**
-	 * Returns the package of this validator switch. <!-- begin-user-doc -->
+	 * Returns the package of this validator switch.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	protected EPackage getEPackage() {
-		return DCPackage.eINSTANCE;
+	  return DCPackage.eINSTANCE;
 	}
 
 	/**
-	 * Calls <code>validateXXX</code> for the corresponding classifier of the
-	 * model. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	protected boolean validate(int classifierID, Object value,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		switch (classifierID) {
-		case DCPackage.POINT:
-			return validatePoint((Point) value, diagnostics, context);
-		case DCPackage.DIMENSION:
-			return validateDimension((Dimension) value, diagnostics, context);
-		case DCPackage.BOUNDS:
-			return validateBounds((Bounds) value, diagnostics, context);
-		case DCPackage.KNOWN_COLOR:
-			return validateKnownColor((KnownColor) value, diagnostics, context);
-		case DCPackage.BOOLEAN:
-			return validateBoolean((Boolean) value, diagnostics, context);
-		case DCPackage.INTEGER:
-			return validateInteger((Integer) value, diagnostics, context);
-		case DCPackage.REAL:
-			return validateReal((Double) value, diagnostics, context);
-		case DCPackage.STRING:
-			return validateString((String) value, diagnostics, context);
-		case DCPackage.COLOR:
-			return validateColor((Color) value, diagnostics, context);
-		default:
-			return true;
+			case DCPackage.POINT:
+				return validatePoint((Point)value, diagnostics, context);
+			case DCPackage.DIMENSION:
+				return validateDimension((Dimension)value, diagnostics, context);
+			case DCPackage.BOUNDS:
+				return validateBounds((Bounds)value, diagnostics, context);
+			case DCPackage.KNOWN_COLOR:
+				return validateKnownColor((KnownColor)value, diagnostics, context);
+			case DCPackage.BOOLEAN:
+				return validateBoolean((Boolean)value, diagnostics, context);
+			case DCPackage.INTEGER:
+				return validateInteger((Integer)value, diagnostics, context);
+			case DCPackage.REAL:
+				return validateReal((Double)value, diagnostics, context);
+			case DCPackage.STRING:
+				return validateString((String)value, diagnostics, context);
+			case DCPackage.COLOR:
+				return validateColor((Color)value, diagnostics, context);
+			default:
+				return true;
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validatePoint(Point point, DiagnosticChain diagnostics,
@@ -190,40 +176,21 @@ public class DCValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateDimension(Dimension dimension,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(dimension, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(dimension,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(dimension, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(dimension,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(dimension,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(dimension, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(dimension, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(dimension, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(dimension, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDimension_nonNegativeWidth(dimension,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDimension_nonNegativeHeight(dimension,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(dimension, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(dimension, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(dimension, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(dimension, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(dimension, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(dimension, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(dimension, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(dimension, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(dimension, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDimension_nonNegativeWidth(dimension, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDimension_nonNegativeHeight(dimension, diagnostics, context);
 		return result;
 	}
 
@@ -251,38 +218,21 @@ public class DCValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateBounds(Bounds bounds, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(bounds, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(bounds,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(bounds, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(bounds, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(bounds,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(bounds, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(bounds, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(bounds, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(bounds, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateBounds_nonNegativeWidth(bounds, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateBounds_nonNegativeHeight(bounds, diagnostics,
-					context);
+		if (!validate_NoCircularContainment(bounds, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(bounds, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(bounds, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(bounds, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(bounds, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(bounds, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(bounds, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(bounds, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(bounds, diagnostics, context);
+		if (result || diagnostics != null) result &= validateBounds_nonNegativeWidth(bounds, diagnostics, context);
+		if (result || diagnostics != null) result &= validateBounds_nonNegativeHeight(bounds, diagnostics, context);
 		return result;
 	}
 
@@ -310,7 +260,6 @@ public class DCValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateKnownColor(KnownColor knownColor,
@@ -320,7 +269,6 @@ public class DCValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateBoolean(boolean boolean_,
@@ -330,7 +278,6 @@ public class DCValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateInteger(int integer, DiagnosticChain diagnostics,
@@ -340,7 +287,6 @@ public class DCValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateReal(double real, DiagnosticChain diagnostics,
@@ -350,7 +296,6 @@ public class DCValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateString(String string, DiagnosticChain diagnostics,
@@ -360,7 +305,6 @@ public class DCValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateColor(Color color, DiagnosticChain diagnostics,
@@ -369,16 +313,14 @@ public class DCValidator extends EObjectValidator {
 	}
 
 	/**
-	 * Returns the resource locator that will be used to fetch messages for this
-	 * validator's diagnostics. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
 		// TODO
-		// Specialize this to return a resource locator for messages specific to
-		// this validator.
+		// Specialize this to return a resource locator for messages specific to this validator.
 		// Ensure that you remove @generated or mark it @generated NOT
 		return super.getResourceLocator();
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java
index d5f092d0227..ab78f601e15 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java
@@ -18,17 +18,18 @@ import org.eclipse.papyrus.dd.dc.Bounds;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Canvas</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Canvas is a kind of group that has bounds. <!--
- * end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Canvas is a kind of group that has bounds.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Canvas#getBounds <em>Bounds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Canvas#getBounds <em>Bounds</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getCanvas()
  * @model
  * @generated
@@ -49,12 +50,10 @@ public interface Canvas extends Group {
 	Bounds getBounds();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Canvas#getBounds
-	 * <em>Bounds</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Canvas#getBounds <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Bounds</em>' containment reference.
+	 * @param value the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java
index 1e3ad034632..683e928c72f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java
@@ -20,18 +20,19 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Circle</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Circle is a graphical element that defines a
- * circular shape with a given center point and a radius. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Circle is a graphical element that defines a circular shape with a given center point and a radius.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Circle#getCenter <em>Center</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Circle#getRadius <em>Radius</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Circle#getCenter <em>Center</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Circle#getRadius <em>Radius</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getCircle()
  * @model
  * @generated
@@ -52,28 +53,26 @@ public interface Circle extends GraphicalElement {
 	Point getCenter();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Circle#getCenter
-	 * <em>Center</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Circle#getCenter <em>Center</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Center</em>' containment reference.
+	 * @param value the new value of the '<em>Center</em>' containment reference.
 	 * @see #getCenter()
 	 * @generated
 	 */
 	void setCenter(Point value);
 
 	/**
-	 * Returns the value of the '<em><b>Radius</b></em>' attribute. The default
-	 * value is <code>"0"</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * <!-- begin-model-doc --> a real number (>=0) that represents the radius
-	 * of the circle. <!-- end-model-doc -->
-	 * 
+	 * Returns the value of the '<em><b>Radius</b></em>' attribute.
+	 * The default value is <code>"0"</code>.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * a real number (>=0) that represents the radius of the circle.
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Radius</em>' attribute.
 	 * @see #setRadius(double)
 	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getCircle_Radius()
-	 * @model default="0" dataType="org.eclipse.papyrus.dd.dc.Real"
-	 *        required="true" ordered="false"
+	 * @model default="0" dataType="org.eclipse.papyrus.dd.dc.Real" required="true" ordered="false"
 	 * @generated
 	 */
 	double getRadius();
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClipPath.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClipPath.java
index 8652e6c3eb9..f09f470ffda 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClipPath.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClipPath.java
@@ -14,12 +14,12 @@ package org.eclipse.papyrus.dd.dg;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Clip Path</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> ClipPath is a kind of group whose members
- * collectively define a painting mask for its referencing graphical elements.
+ *
+ * <!-- begin-model-doc -->
+ * ClipPath is a kind of group whose members collectively define a painting mask for its referencing graphical elements.
  * <!-- end-model-doc -->
- * 
- * 
+ *
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getClipPath()
  * @model
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClosePath.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClosePath.java
index d6d6efc3457..f5c681d952c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClosePath.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClosePath.java
@@ -14,13 +14,12 @@ package org.eclipse.papyrus.dd.dg;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Close Path</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> ClosePath is a kind of path command that ends the
- * current subpath and causes an automatic straight line to be drawn from the
- * current point to the initial point of the current subpath. <!-- end-model-doc
- * -->
- * 
- * 
+ *
+ * <!-- begin-model-doc -->
+ * ClosePath is a kind of path command that ends the current subpath and causes an automatic straight line to be drawn from the current point to the initial point of the current subpath.
+ * <!-- end-model-doc -->
+ *
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getClosePath()
  * @model
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java
index c995ff4d354..0c596e65ce7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java
@@ -16,28 +16,23 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Cubic Curve To</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> CubicCurveTo is a kind of path command that draws a
- * cubic b?zier curve from the current point to a new point using a start and an
- * end control points. Definitions nests definitions that are commonly
- * referenced in the containing canvas. It can also nest an embedded stylesheet.
- * EllipticalArcTo is a kind of path command that draws an elliptical arc from
- * the current point to a new point in the coordinate system. QuadraticCurveTo
- * is a kind of path command that draws a quadratic b?zier curve from the
- * current point to a new point using a single control point. <!-- end-model-doc
- * -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * CubicCurveTo is a kind of path command that draws a cubic b?zier curve from the current point to a new point using a start and an end control points.
+ * Definitions nests definitions that are commonly referenced in the containing canvas. It can also nest an embedded stylesheet.
+ * EllipticalArcTo is a kind of path command that draws an elliptical arc from the current point to a new point in the coordinate system.
+ * QuadraticCurveTo is a kind of path command that draws a quadratic b?zier curve from the current point to a new point using a single control point.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl <em>Start
- * Control</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl <em>End
- * Control</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint <em>Point</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl <em>Start Control</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl <em>End Control</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getCubicCurveTo()
  * @model
  * @generated
@@ -58,12 +53,9 @@ public interface CubicCurveTo extends PathCommand {
 	Point getPoint();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint <em>Point</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Point</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint <em>Point</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
@@ -84,14 +76,10 @@ public interface CubicCurveTo extends PathCommand {
 	Point getStartControl();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl
-	 * <em>Start Control</em>}' containment reference. <!-- begin-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl <em>Start Control</em>}' containment reference.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Start Control</em>' containment
-	 *            reference.
+	 * @param value the new value of the '<em>Start Control</em>' containment reference.
 	 * @see #getStartControl()
 	 * @generated
 	 */
@@ -112,14 +100,10 @@ public interface CubicCurveTo extends PathCommand {
 	Point getEndControl();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl
-	 * <em>End Control</em>}' containment reference. <!-- begin-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl <em>End Control</em>}' containment reference.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>End Control</em>' containment
-	 *            reference.
+	 * @param value the new value of the '<em>End Control</em>' containment reference.
 	 * @see #getEndControl()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java
index 6726c1dc661..11ecebd373e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java
@@ -16,86 +16,85 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
  * create method for each non-abstract class of the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage
  * @generated
  */
 public interface DGFactory extends EFactory {
 	/**
-	 * The singleton instance of the factory. <!-- begin-user-doc --> <!--
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	DGFactory eINSTANCE = org.eclipse.papyrus.dd.dg.impl.DGFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>Canvas</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Canvas</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Canvas</em>'.
 	 * @generated
 	 */
 	Canvas createCanvas();
 
 	/**
-	 * Returns a new object of class '<em>Group</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Group</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Group</em>'.
 	 * @generated
 	 */
 	Group createGroup();
 
 	/**
-	 * Returns a new object of class '<em>Move To</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Move To</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Move To</em>'.
 	 * @generated
 	 */
 	MoveTo createMoveTo();
 
 	/**
-	 * Returns a new object of class '<em>Clip Path</em>'. <!-- begin-user-doc
+	 * Returns a new object of class '<em>Clip Path</em>'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Clip Path</em>'.
 	 * @generated
 	 */
 	ClipPath createClipPath();
 
 	/**
-	 * Returns a new object of class '<em>Style</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Style</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Style</em>'.
 	 * @generated
 	 */
 	Style createStyle();
 
 	/**
-	 * Returns a new object of class '<em>Paint</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Paint</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Paint</em>'.
 	 * @generated
 	 */
 	Paint createPaint();
 
 	/**
-	 * Returns a new object of class '<em>Circle</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Circle</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Circle</em>'.
 	 * @generated
 	 */
 	Circle createCircle();
 
 	/**
-	 * Returns a new object of class '<em>Close Path</em>'. <!-- begin-user-doc
+	 * Returns a new object of class '<em>Close Path</em>'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Close Path</em>'.
 	 * @generated
 	 */
@@ -111,27 +110,27 @@ public interface DGFactory extends EFactory {
 	CubicCurveTo createCubicCurveTo();
 
 	/**
-	 * Returns a new object of class '<em>Definitions</em>'. <!-- begin-user-doc
+	 * Returns a new object of class '<em>Definitions</em>'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Definitions</em>'.
 	 * @generated
 	 */
 	Definitions createDefinitions();
 
 	/**
-	 * Returns a new object of class '<em>Style Sheet</em>'. <!-- begin-user-doc
+	 * Returns a new object of class '<em>Style Sheet</em>'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Style Sheet</em>'.
 	 * @generated
 	 */
 	StyleSheet createStyleSheet();
 
 	/**
-	 * Returns a new object of class '<em>Style Rule</em>'. <!-- begin-user-doc
+	 * Returns a new object of class '<em>Style Rule</em>'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Style Rule</em>'.
 	 * @generated
 	 */
@@ -147,9 +146,9 @@ public interface DGFactory extends EFactory {
 	StyleSelector createStyleSelector();
 
 	/**
-	 * Returns a new object of class '<em>Ellipse</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Ellipse</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Ellipse</em>'.
 	 * @generated
 	 */
@@ -183,27 +182,27 @@ public interface DGFactory extends EFactory {
 	GradientStop createGradientStop();
 
 	/**
-	 * Returns a new object of class '<em>Image</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Image</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Image</em>'.
 	 * @generated
 	 */
 	Image createImage();
 
 	/**
-	 * Returns a new object of class '<em>Line</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Line</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Line</em>'.
 	 * @generated
 	 */
 	Line createLine();
 
 	/**
-	 * Returns a new object of class '<em>Marker</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Marker</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Marker</em>'.
 	 * @generated
 	 */
@@ -219,54 +218,54 @@ public interface DGFactory extends EFactory {
 	LinearGradient createLinearGradient();
 
 	/**
-	 * Returns a new object of class '<em>Line To</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Line To</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Line To</em>'.
 	 * @generated
 	 */
 	LineTo createLineTo();
 
 	/**
-	 * Returns a new object of class '<em>Matrix</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Matrix</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Matrix</em>'.
 	 * @generated
 	 */
 	Matrix createMatrix();
 
 	/**
-	 * Returns a new object of class '<em>Path</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Path</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Path</em>'.
 	 * @generated
 	 */
 	Path createPath();
 
 	/**
-	 * Returns a new object of class '<em>Pattern</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Pattern</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Pattern</em>'.
 	 * @generated
 	 */
 	Pattern createPattern();
 
 	/**
-	 * Returns a new object of class '<em>Polygon</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Polygon</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Polygon</em>'.
 	 * @generated
 	 */
 	Polygon createPolygon();
 
 	/**
-	 * Returns a new object of class '<em>Polyline</em>'. <!-- begin-user-doc
+	 * Returns a new object of class '<em>Polyline</em>'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Polyline</em>'.
 	 * @generated
 	 */
@@ -282,81 +281,81 @@ public interface DGFactory extends EFactory {
 	RadialGradient createRadialGradient();
 
 	/**
-	 * Returns a new object of class '<em>Rectangle</em>'. <!-- begin-user-doc
+	 * Returns a new object of class '<em>Rectangle</em>'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Rectangle</em>'.
 	 * @generated
 	 */
 	Rectangle createRectangle();
 
 	/**
-	 * Returns a new object of class '<em>Root Canvas</em>'. <!-- begin-user-doc
+	 * Returns a new object of class '<em>Root Canvas</em>'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Root Canvas</em>'.
 	 * @generated
 	 */
 	RootCanvas createRootCanvas();
 
 	/**
-	 * Returns a new object of class '<em>Rotate</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Rotate</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Rotate</em>'.
 	 * @generated
 	 */
 	Rotate createRotate();
 
 	/**
-	 * Returns a new object of class '<em>Scale</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Scale</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Scale</em>'.
 	 * @generated
 	 */
 	Scale createScale();
 
 	/**
-	 * Returns a new object of class '<em>Skew</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Skew</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Skew</em>'.
 	 * @generated
 	 */
 	Skew createSkew();
 
 	/**
-	 * Returns a new object of class '<em>Text</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Text</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Text</em>'.
 	 * @generated
 	 */
 	Text createText();
 
 	/**
-	 * Returns a new object of class '<em>Translate</em>'. <!-- begin-user-doc
+	 * Returns a new object of class '<em>Translate</em>'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Translate</em>'.
 	 * @generated
 	 */
 	Translate createTranslate();
 
 	/**
-	 * Returns a new object of class '<em>Use</em>'. <!-- begin-user-doc -->
+	 * Returns a new object of class '<em>Use</em>'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return a new object of class '<em>Use</em>'.
 	 * @generated
 	 */
 	Use createUse();
 
 	/**
-	 * Returns the package supported by this factory. <!-- begin-user-doc -->
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java
index b02830381e0..3ed6eb2b538 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java
@@ -43,39 +43,37 @@ import org.eclipse.emf.ecore.EReference;
  */
 public interface DGPackage extends EPackage {
 	/**
-	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The package name.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	String eNAME = "dg";
 
 	/**
-	 * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The package namespace URI.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	String eNS_URI = "http://www.omg.org/spec/DD/20110901/DG";
 
 	/**
-	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The package namespace name.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	String eNS_PREFIX = "dg";
 
 	/**
-	 * The singleton instance of the package. <!-- begin-user-doc --> <!--
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	DGPackage eINSTANCE = org.eclipse.papyrus.dd.dg.impl.DGPackageImpl.init();
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.DefinitionImpl <em>Definition</em>}
-	 * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.DefinitionImpl <em>Definition</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.DefinitionImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getDefinition()
 	 * @generated
@@ -94,7 +92,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Definition</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -119,11 +116,9 @@ public interface DGPackage extends EPackage {
 	int DEFINITION_OPERATION_COUNT = 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl
-	 * <em>Graphical Element</em>}' class. <!-- begin-user-doc --> <!--
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl <em>Graphical Element</em>}' class.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGraphicalElement()
 	 * @generated
@@ -169,29 +164,35 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GRAPHICAL_ELEMENT__STYLE = DEFINITION_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int GRAPHICAL_ELEMENT__TRANSFORM = DEFINITION_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the '<em>Graphical Element</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GRAPHICAL_ELEMENT__LAYOUT_DATA = DEFINITION_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of structural features of the '<em>Graphical Element</em>' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int GRAPHICAL_ELEMENT_FEATURE_COUNT = DEFINITION_FEATURE_COUNT + 5;
+	int GRAPHICAL_ELEMENT_FEATURE_COUNT = DEFINITION_FEATURE_COUNT + 6;
 
 	/**
 	 * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!--
@@ -205,7 +206,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -221,10 +221,8 @@ public interface DGPackage extends EPackage {
 	int GRAPHICAL_ELEMENT_OPERATION_COUNT = DEFINITION_OPERATION_COUNT + 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.GroupImpl <em>Group</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl <em>Group</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.GroupImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGroup()
 	 * @generated
@@ -270,38 +268,53 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int GROUP__STYLE = GRAPHICAL_ELEMENT__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int GROUP__TRANSFORM = GRAPHICAL_ELEMENT__TRANSFORM;
 
 	/**
-	 * The feature id for the '<em><b>Member</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GROUP__LAYOUT_DATA = GRAPHICAL_ELEMENT__LAYOUT_DATA;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int GROUP__MEMBER = GRAPHICAL_ELEMENT_FEATURE_COUNT + 0;
 
 	/**
+	 * The feature id for the '<em><b>Layout</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int GROUP__LAYOUT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
 	 * The number of structural features of the '<em>Group</em>' class. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int GROUP_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 1;
+	int GROUP_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
 	 * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!--
@@ -315,7 +328,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -331,10 +343,8 @@ public interface DGPackage extends EPackage {
 	int GROUP_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.CanvasImpl <em>Canvas</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.CanvasImpl <em>Canvas</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.CanvasImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getCanvas()
 	 * @generated
@@ -380,34 +390,48 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CANVAS__STYLE = GROUP__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int CANVAS__TRANSFORM = GROUP__TRANSFORM;
 
 	/**
-	 * The feature id for the '<em><b>Member</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CANVAS__LAYOUT_DATA = GROUP__LAYOUT_DATA;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int CANVAS__MEMBER = GROUP__MEMBER;
 
 	/**
+	 * The feature id for the '<em><b>Layout</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CANVAS__LAYOUT = GROUP__LAYOUT;
+
+	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -434,16 +458,14 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CANVAS___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GROUP___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Canvas Cannot Have Transforms</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Canvas Cannot Have Transforms</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -482,7 +504,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Path Command</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -498,10 +519,8 @@ public interface DGPackage extends EPackage {
 	int PATH_COMMAND_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.MoveToImpl <em>Move To</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.MoveToImpl <em>Move To</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.MoveToImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMoveTo()
 	 * @generated
@@ -520,7 +539,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -545,10 +563,8 @@ public interface DGPackage extends EPackage {
 	int MOVE_TO_OPERATION_COUNT = PATH_COMMAND_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.ClipPathImpl <em>Clip Path</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.ClipPathImpl <em>Clip Path</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.ClipPathImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getClipPath()
 	 * @generated
@@ -594,31 +610,46 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CLIP_PATH__STYLE = GROUP__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int CLIP_PATH__TRANSFORM = GROUP__TRANSFORM;
 
 	/**
-	 * The feature id for the '<em><b>Member</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLIP_PATH__LAYOUT_DATA = GROUP__LAYOUT_DATA;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int CLIP_PATH__MEMBER = GROUP__MEMBER;
 
 	/**
+	 * The feature id for the '<em><b>Layout</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CLIP_PATH__LAYOUT = GROUP__LAYOUT;
+
+	/**
 	 * The number of structural features of the '<em>Clip Path</em>' class. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -639,7 +670,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -655,10 +685,8 @@ public interface DGPackage extends EPackage {
 	int CLIP_PATH_OPERATION_COUNT = GROUP_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.StyleImpl <em>Style</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl <em>Style</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.StyleImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyle()
 	 * @generated
@@ -686,7 +714,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Stroke</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -711,9 +738,8 @@ public interface DGPackage extends EPackage {
 	int STYLE__STROKE_OPACITY = 4;
 
 	/**
-	 * The feature id for the '<em><b>Stroke Dash Length</b></em>' attribute
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Stroke Dash Length</b></em>' attribute list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -803,7 +829,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Valid Dash Length Size</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -828,10 +853,8 @@ public interface DGPackage extends EPackage {
 	int STYLE_OPERATION_COUNT = 5;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.PaintImpl <em>Paint</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.PaintImpl <em>Paint</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.PaintImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPaint()
 	 * @generated
@@ -866,9 +889,8 @@ public interface DGPackage extends EPackage {
 	int PAINT_FEATURE_COUNT = 2;
 
 	/**
-	 * The operation id for the '<em>Referenced Paint Server Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced Paint Server Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -905,9 +927,8 @@ public interface DGPackage extends EPackage {
 	int PAINT_SERVER__ID = DEFINITION__ID;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -916,7 +937,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Paint Server</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -941,10 +961,8 @@ public interface DGPackage extends EPackage {
 	int PAINT_SERVER_OPERATION_COUNT = DEFINITION_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.TransformImpl <em>Transform</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.TransformImpl <em>Transform</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.TransformImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getTransform()
 	 * @generated
@@ -970,10 +988,8 @@ public interface DGPackage extends EPackage {
 	int TRANSFORM_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.CircleImpl <em>Circle</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.CircleImpl <em>Circle</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.CircleImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getCircle()
 	 * @generated
@@ -1019,25 +1035,31 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int CIRCLE__STYLE = GRAPHICAL_ELEMENT__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int CIRCLE__TRANSFORM = GRAPHICAL_ELEMENT__TRANSFORM;
 
 	/**
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int CIRCLE__LAYOUT_DATA = GRAPHICAL_ELEMENT__LAYOUT_DATA;
+
+	/**
 	 * The feature id for the '<em><b>Center</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1073,7 +1095,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1098,10 +1119,8 @@ public interface DGPackage extends EPackage {
 	int CIRCLE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.ClosePathImpl <em>Close Path</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.ClosePathImpl <em>Close Path</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.ClosePathImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getClosePath()
 	 * @generated
@@ -1120,7 +1139,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Close Path</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1136,11 +1154,9 @@ public interface DGPackage extends EPackage {
 	int CLOSE_PATH_OPERATION_COUNT = PATH_COMMAND_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl
-	 * <em>Cubic Curve To</em>}' class. <!-- begin-user-doc --> <!--
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl <em>Cubic Curve To</em>}' class.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getCubicCurveTo()
 	 * @generated
@@ -1157,18 +1173,16 @@ public interface DGPackage extends EPackage {
 	int CUBIC_CURVE_TO__IS_RELATIVE = PATH_COMMAND__IS_RELATIVE;
 
 	/**
-	 * The feature id for the '<em><b>Start Control</b></em>' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Start Control</b></em>' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int CUBIC_CURVE_TO__START_CONTROL = PATH_COMMAND_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>End Control</b></em>' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>End Control</b></em>' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -1177,7 +1191,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1186,7 +1199,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Cubic Curve To</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1214,18 +1226,16 @@ public interface DGPackage extends EPackage {
 	int DEFINITIONS = 14;
 
 	/**
-	 * The feature id for the '<em><b>Defnition</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Defnition</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int DEFINITIONS__DEFNITION = 0;
 
 	/**
-	 * The feature id for the '<em><b>Style Sheet</b></em>' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Style Sheet</b></em>' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -1234,7 +1244,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Definitions</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1264,7 +1273,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Rule</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1273,7 +1281,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Style Sheet</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1289,10 +1296,8 @@ public interface DGPackage extends EPackage {
 	int STYLE_SHEET_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl <em>Style Rule</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl <em>Style Rule</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyleRule()
 	 * @generated
@@ -1300,9 +1305,8 @@ public interface DGPackage extends EPackage {
 	int STYLE_RULE = 16;
 
 	/**
-	 * The feature id for the '<em><b>Selector</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Selector</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -1311,7 +1315,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1320,7 +1323,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Style Rule</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1336,11 +1338,9 @@ public interface DGPackage extends EPackage {
 	int STYLE_RULE_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl
-	 * <em>Style Selector</em>}' class. <!-- begin-user-doc --> <!--
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl <em>Style Selector</em>}' class.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyleSelector()
 	 * @generated
@@ -1368,7 +1368,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Style Selector</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1384,10 +1383,8 @@ public interface DGPackage extends EPackage {
 	int STYLE_SELECTOR_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl <em>Ellipse</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl <em>Ellipse</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.EllipseImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getEllipse()
 	 * @generated
@@ -1433,25 +1430,31 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ELLIPSE__STYLE = GRAPHICAL_ELEMENT__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int ELLIPSE__TRANSFORM = GRAPHICAL_ELEMENT__TRANSFORM;
 
 	/**
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ELLIPSE__LAYOUT_DATA = GRAPHICAL_ELEMENT__LAYOUT_DATA;
+
+	/**
 	 * The feature id for the '<em><b>Center</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1460,7 +1463,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Radii</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1487,7 +1489,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1503,11 +1504,9 @@ public interface DGPackage extends EPackage {
 	int ELLIPSE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl
-	 * <em>Elliptical Arc To</em>}' class. <!-- begin-user-doc --> <!--
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl <em>Elliptical Arc To</em>}' class.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getEllipticalArcTo()
 	 * @generated
@@ -1526,7 +1525,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Radii</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1562,16 +1560,14 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ELLIPTICAL_ARC_TO__POINT = PATH_COMMAND_FEATURE_COUNT + 4;
 
 	/**
-	 * The number of structural features of the '<em>Elliptical Arc To</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The number of structural features of the '<em>Elliptical Arc To</em>' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -1587,11 +1583,9 @@ public interface DGPackage extends EPackage {
 	int ELLIPTICAL_ARC_TO_OPERATION_COUNT = PATH_COMMAND_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl
-	 * <em>Quadratic Curve To</em>}' class. <!-- begin-user-doc --> <!--
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl <em>Quadratic Curve To</em>}' class.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getQuadraticCurveTo()
 	 * @generated
@@ -1610,7 +1604,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Control</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1619,16 +1612,14 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int QUADRATIC_CURVE_TO__POINT = PATH_COMMAND_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Quadratic Curve To</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The number of structural features of the '<em>Quadratic Curve To</em>' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -1644,10 +1635,8 @@ public interface DGPackage extends EPackage {
 	int QUADRATIC_CURVE_TO_OPERATION_COUNT = PATH_COMMAND_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.GradientImpl <em>Gradient</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.GradientImpl <em>Gradient</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.GradientImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGradient()
 	 * @generated
@@ -1664,9 +1653,8 @@ public interface DGPackage extends EPackage {
 	int GRADIENT__ID = PAINT_SERVER__ID;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -1675,7 +1663,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Stop</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1750,7 +1737,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Gradient Stop</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1784,10 +1770,8 @@ public interface DGPackage extends EPackage {
 	int GRADIENT_STOP_OPERATION_COUNT = 2;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.ImageImpl <em>Image</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl <em>Image</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.ImageImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getImage()
 	 * @generated
@@ -1833,22 +1817,29 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMAGE__STYLE = GRAPHICAL_ELEMENT__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int IMAGE__TRANSFORM = GRAPHICAL_ELEMENT__TRANSFORM;
 
 	/**
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int IMAGE__LAYOUT_DATA = GRAPHICAL_ELEMENT__LAYOUT_DATA;
+
+	/**
 	 * The feature id for the '<em><b>Source</b></em>' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -1860,16 +1851,14 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int IMAGE__BOUNDS = GRAPHICAL_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Is Aspect Ratio Preserved</b></em>'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Is Aspect Ratio Preserved</b></em>' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -1896,7 +1885,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1905,7 +1893,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Source Cannot Be Empty</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1921,11 +1908,9 @@ public interface DGPackage extends EPackage {
 	int IMAGE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl
-	 * <em>Marked Element</em>}' class. <!-- begin-user-doc --> <!--
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl <em>Marked Element</em>}' class.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMarkedElement()
 	 * @generated
@@ -1971,22 +1956,29 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MARKED_ELEMENT__STYLE = GRAPHICAL_ELEMENT__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int MARKED_ELEMENT__TRANSFORM = GRAPHICAL_ELEMENT__TRANSFORM;
 
 	/**
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARKED_ELEMENT__LAYOUT_DATA = GRAPHICAL_ELEMENT__LAYOUT_DATA;
+
+	/**
 	 * The feature id for the '<em><b>End Marker</b></em>' reference. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -2016,7 +2008,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Marked Element</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2034,34 +2025,30 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MARKED_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced Start Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced Start Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT_OPERATION_COUNT + 1;
 
 	/**
-	 * The operation id for the '<em>Referenced End Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced End Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2077,10 +2064,8 @@ public interface DGPackage extends EPackage {
 	int MARKED_ELEMENT_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 3;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.LineImpl <em>Line</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.LineImpl <em>Line</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.LineImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getLine()
 	 * @generated
@@ -2126,22 +2111,29 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LINE__STYLE = MARKED_ELEMENT__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int LINE__TRANSFORM = MARKED_ELEMENT__TRANSFORM;
 
 	/**
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int LINE__LAYOUT_DATA = MARKED_ELEMENT__LAYOUT_DATA;
+
+	/**
 	 * The feature id for the '<em><b>End Marker</b></em>' reference. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -2171,7 +2163,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Start</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2207,34 +2198,30 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int LINE___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced Start Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced Start Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int LINE___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int LINE___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced End Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced End Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2250,10 +2237,8 @@ public interface DGPackage extends EPackage {
 	int LINE_OPERATION_COUNT = MARKED_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl <em>Marker</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl <em>Marker</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.MarkerImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMarker()
 	 * @generated
@@ -2299,31 +2284,46 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MARKER__STYLE = GROUP__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int MARKER__TRANSFORM = GROUP__TRANSFORM;
 
 	/**
-	 * The feature id for the '<em><b>Member</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARKER__LAYOUT_DATA = GROUP__LAYOUT_DATA;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int MARKER__MEMBER = GROUP__MEMBER;
 
 	/**
+	 * The feature id for the '<em><b>Layout</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int MARKER__LAYOUT = GROUP__LAYOUT;
+
+	/**
 	 * The feature id for the '<em><b>Size</b></em>' containment reference. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -2335,7 +2335,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Reference</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2362,7 +2361,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2378,11 +2376,9 @@ public interface DGPackage extends EPackage {
 	int MARKER_OPERATION_COUNT = GROUP_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl
-	 * <em>Linear Gradient</em>}' class. <!-- begin-user-doc --> <!--
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl <em>Linear Gradient</em>}' class.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getLinearGradient()
 	 * @generated
@@ -2399,9 +2395,8 @@ public interface DGPackage extends EPackage {
 	int LINEAR_GRADIENT__ID = GRADIENT__ID;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2410,7 +2405,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Stop</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2419,7 +2413,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Start</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2435,9 +2428,8 @@ public interface DGPackage extends EPackage {
 	int LINEAR_GRADIENT__END = GRADIENT_FEATURE_COUNT + 1;
 
 	/**
-	 * The number of structural features of the '<em>Linear Gradient</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The number of structural features of the '<em>Linear Gradient</em>' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2471,10 +2463,8 @@ public interface DGPackage extends EPackage {
 	int LINEAR_GRADIENT_OPERATION_COUNT = GRADIENT_OPERATION_COUNT + 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.LineToImpl <em>Line To</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.LineToImpl <em>Line To</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.LineToImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getLineTo()
 	 * @generated
@@ -2493,7 +2483,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2518,10 +2507,8 @@ public interface DGPackage extends EPackage {
 	int LINE_TO_OPERATION_COUNT = PATH_COMMAND_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl <em>Matrix</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl <em>Matrix</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.MatrixImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMatrix()
 	 * @generated
@@ -2529,54 +2516,54 @@ public interface DGPackage extends EPackage {
 	int MATRIX = 29;
 
 	/**
-	 * The feature id for the '<em><b>A</b></em>' attribute. <!-- begin-user-doc
+	 * The feature id for the '<em><b>A</b></em>' attribute.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MATRIX__A = TRANSFORM_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>B</b></em>' attribute. <!-- begin-user-doc
+	 * The feature id for the '<em><b>B</b></em>' attribute.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MATRIX__B = TRANSFORM_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>C</b></em>' attribute. <!-- begin-user-doc
+	 * The feature id for the '<em><b>C</b></em>' attribute.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MATRIX__C = TRANSFORM_FEATURE_COUNT + 2;
 
 	/**
-	 * The feature id for the '<em><b>D</b></em>' attribute. <!-- begin-user-doc
+	 * The feature id for the '<em><b>D</b></em>' attribute.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MATRIX__D = TRANSFORM_FEATURE_COUNT + 3;
 
 	/**
-	 * The feature id for the '<em><b>E</b></em>' attribute. <!-- begin-user-doc
+	 * The feature id for the '<em><b>E</b></em>' attribute.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MATRIX__E = TRANSFORM_FEATURE_COUNT + 4;
 
 	/**
-	 * The feature id for the '<em><b>F</b></em>' attribute. <!-- begin-user-doc
+	 * The feature id for the '<em><b>F</b></em>' attribute.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2601,10 +2588,8 @@ public interface DGPackage extends EPackage {
 	int MATRIX_OPERATION_COUNT = TRANSFORM_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.PathImpl <em>Path</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.PathImpl <em>Path</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.PathImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPath()
 	 * @generated
@@ -2650,22 +2635,29 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PATH__STYLE = MARKED_ELEMENT__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int PATH__TRANSFORM = MARKED_ELEMENT__TRANSFORM;
 
 	/**
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int PATH__LAYOUT_DATA = MARKED_ELEMENT__LAYOUT_DATA;
+
+	/**
 	 * The feature id for the '<em><b>End Marker</b></em>' reference. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -2693,9 +2685,8 @@ public interface DGPackage extends EPackage {
 	int PATH__START_MARKER = MARKED_ELEMENT__START_MARKER;
 
 	/**
-	 * The feature id for the '<em><b>Command</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Command</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2722,34 +2713,30 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int PATH___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced Start Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced Start Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int PATH___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int PATH___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced End Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced End Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2758,7 +2745,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>First Command Must Be Move</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2774,10 +2760,8 @@ public interface DGPackage extends EPackage {
 	int PATH_OPERATION_COUNT = MARKED_ELEMENT_OPERATION_COUNT + 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.PatternImpl <em>Pattern</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.PatternImpl <em>Pattern</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.PatternImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPattern()
 	 * @generated
@@ -2794,9 +2778,8 @@ public interface DGPackage extends EPackage {
 	int PATTERN__ID = PAINT_SERVER__ID;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2805,7 +2788,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2848,10 +2830,8 @@ public interface DGPackage extends EPackage {
 	int PATTERN_OPERATION_COUNT = PAINT_SERVER_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.PolygonImpl <em>Polygon</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.PolygonImpl <em>Polygon</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.PolygonImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPolygon()
 	 * @generated
@@ -2897,22 +2877,29 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int POLYGON__STYLE = MARKED_ELEMENT__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int POLYGON__TRANSFORM = MARKED_ELEMENT__TRANSFORM;
 
 	/**
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int POLYGON__LAYOUT_DATA = MARKED_ELEMENT__LAYOUT_DATA;
+
+	/**
 	 * The feature id for the '<em><b>End Marker</b></em>' reference. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -2940,9 +2927,8 @@ public interface DGPackage extends EPackage {
 	int POLYGON__START_MARKER = MARKED_ELEMENT__START_MARKER;
 
 	/**
-	 * The feature id for the '<em><b>Point</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Point</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -2969,34 +2955,30 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int POLYGON___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced Start Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced Start Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int POLYGON___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int POLYGON___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced End Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced End Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -3012,10 +2994,8 @@ public interface DGPackage extends EPackage {
 	int POLYGON_OPERATION_COUNT = MARKED_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.PolylineImpl <em>Polyline</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.PolylineImpl <em>Polyline</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.PolylineImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPolyline()
 	 * @generated
@@ -3061,22 +3041,29 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int POLYLINE__STYLE = MARKED_ELEMENT__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int POLYLINE__TRANSFORM = MARKED_ELEMENT__TRANSFORM;
 
 	/**
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int POLYLINE__LAYOUT_DATA = MARKED_ELEMENT__LAYOUT_DATA;
+
+	/**
 	 * The feature id for the '<em><b>End Marker</b></em>' reference. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -3104,9 +3091,8 @@ public interface DGPackage extends EPackage {
 	int POLYLINE__START_MARKER = MARKED_ELEMENT__START_MARKER;
 
 	/**
-	 * The feature id for the '<em><b>Point</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Point</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -3133,34 +3119,30 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int POLYLINE___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced Start Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced Start Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int POLYLINE___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int POLYLINE___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Referenced End Marker Has Id</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Referenced End Marker Has Id</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -3176,11 +3158,9 @@ public interface DGPackage extends EPackage {
 	int POLYLINE_OPERATION_COUNT = MARKED_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl
-	 * <em>Radial Gradient</em>}' class. <!-- begin-user-doc --> <!--
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl <em>Radial Gradient</em>}' class.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getRadialGradient()
 	 * @generated
@@ -3197,9 +3177,8 @@ public interface DGPackage extends EPackage {
 	int RADIAL_GRADIENT__ID = GRADIENT__ID;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -3208,7 +3187,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Stop</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3217,7 +3195,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Center</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3226,7 +3203,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Focus</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3242,9 +3218,8 @@ public interface DGPackage extends EPackage {
 	int RADIAL_GRADIENT__RADIUS = GRADIENT_FEATURE_COUNT + 2;
 
 	/**
-	 * The number of structural features of the '<em>Radial Gradient</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The number of structural features of the '<em>Radial Gradient</em>' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -3296,10 +3271,8 @@ public interface DGPackage extends EPackage {
 	int RADIAL_GRADIENT_OPERATION_COUNT = GRADIENT_OPERATION_COUNT + 3;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl <em>Rectangle</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl <em>Rectangle</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.RectangleImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getRectangle()
 	 * @generated
@@ -3345,25 +3318,31 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int RECTANGLE__STYLE = GRAPHICAL_ELEMENT__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int RECTANGLE__TRANSFORM = GRAPHICAL_ELEMENT__TRANSFORM;
 
 	/**
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int RECTANGLE__LAYOUT_DATA = GRAPHICAL_ELEMENT__LAYOUT_DATA;
+
+	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3399,7 +3378,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3408,7 +3386,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Non Negative Corner Radius</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3474,34 +3451,48 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ROOT_CANVAS__STYLE = CANVAS__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int ROOT_CANVAS__TRANSFORM = CANVAS__TRANSFORM;
 
 	/**
-	 * The feature id for the '<em><b>Member</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ROOT_CANVAS__LAYOUT_DATA = CANVAS__LAYOUT_DATA;
+
+	/**
+	 * The feature id for the '<em><b>Member</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int ROOT_CANVAS__MEMBER = CANVAS__MEMBER;
 
 	/**
+	 * The feature id for the '<em><b>Layout</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ROOT_CANVAS__LAYOUT = CANVAS__LAYOUT;
+
+	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3517,31 +3508,37 @@ public interface DGPackage extends EPackage {
 	int ROOT_CANVAS__BACKGROUND_COLOR = CANVAS_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Definitions</b></em>' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Definitions</b></em>' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int ROOT_CANVAS__DEFINITIONS = CANVAS_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>External Style Sheet</b></em>' reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>External Style Sheet</b></em>' reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int ROOT_CANVAS__EXTERNAL_STYLE_SHEET = CANVAS_FEATURE_COUNT + 2;
 
 	/**
+	 * The feature id for the '<em><b>Script</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ROOT_CANVAS__SCRIPT = CANVAS_FEATURE_COUNT + 3;
+
+	/**
 	 * The number of structural features of the '<em>Root Canvas</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int ROOT_CANVAS_FEATURE_COUNT = CANVAS_FEATURE_COUNT + 3;
+	int ROOT_CANVAS_FEATURE_COUNT = CANVAS_FEATURE_COUNT + 4;
 
 	/**
 	 * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!--
@@ -3555,16 +3552,14 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int ROOT_CANVAS___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = CANVAS___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP;
 
 	/**
-	 * The operation id for the '<em>Canvas Cannot Have Transforms</em>'
-	 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The operation id for the '<em>Canvas Cannot Have Transforms</em>' operation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -3580,10 +3575,8 @@ public interface DGPackage extends EPackage {
 	int ROOT_CANVAS_OPERATION_COUNT = CANVAS_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.RotateImpl <em>Rotate</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.RotateImpl <em>Rotate</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.RotateImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getRotate()
 	 * @generated
@@ -3602,7 +3595,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Center</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3627,10 +3619,8 @@ public interface DGPackage extends EPackage {
 	int ROTATE_OPERATION_COUNT = TRANSFORM_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl <em>Scale</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl <em>Scale</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.ScaleImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getScale()
 	 * @generated
@@ -3683,10 +3673,8 @@ public interface DGPackage extends EPackage {
 	int SCALE_OPERATION_COUNT = TRANSFORM_OPERATION_COUNT + 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.SkewImpl <em>Skew</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.SkewImpl <em>Skew</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.SkewImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getSkew()
 	 * @generated
@@ -3730,10 +3718,8 @@ public interface DGPackage extends EPackage {
 	int SKEW_OPERATION_COUNT = TRANSFORM_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.TextImpl <em>Text</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.TextImpl <em>Text</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.TextImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getText()
 	 * @generated
@@ -3779,22 +3765,29 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEXT__STYLE = GRAPHICAL_ELEMENT__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int TEXT__TRANSFORM = GRAPHICAL_ELEMENT__TRANSFORM;
 
 	/**
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TEXT__LAYOUT_DATA = GRAPHICAL_ELEMENT__LAYOUT_DATA;
+
+	/**
 	 * The feature id for the '<em><b>Data</b></em>' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -3806,20 +3799,28 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Position</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEXT__POSITION = GRAPHICAL_ELEMENT_FEATURE_COUNT + 1;
 
 	/**
+	 * The feature id for the '<em><b>Anchor</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TEXT__ANCHOR = GRAPHICAL_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
 	 * The number of structural features of the '<em>Text</em>' class. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 * @ordered
 	 */
-	int TEXT_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 2;
+	int TEXT_FEATURE_COUNT = GRAPHICAL_ELEMENT_FEATURE_COUNT + 3;
 
 	/**
 	 * The operation id for the '<em>Id Cannot Be Empty</em>' operation. <!--
@@ -3833,7 +3834,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3858,10 +3858,8 @@ public interface DGPackage extends EPackage {
 	int TEXT_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl <em>Translate</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl <em>Translate</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.impl.TranslateImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getTranslate()
 	 * @generated
@@ -3954,25 +3952,31 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int USE__STYLE = GRAPHICAL_ELEMENT__STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Transform</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
 	int USE__TRANSFORM = GRAPHICAL_ELEMENT__TRANSFORM;
 
 	/**
+	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int USE__LAYOUT_DATA = GRAPHICAL_ELEMENT__LAYOUT_DATA;
+
+	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3981,7 +3985,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Referenced Element</b></em>' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4008,7 +4011,6 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4017,26 +4019,23 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Element Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP = GRAPHICAL_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The number of operations of the '<em>Use</em>' class. <!-- begin-user-doc
+	 * The number of operations of the '<em>Use</em>' class.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int USE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.FontDecoration <em>Font Decoration</em>}
-	 * ' enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.FontDecoration <em>Font Decoration</em>}' enum.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.dg.FontDecoration
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getFontDecoration()
 	 * @generated
@@ -4055,6 +4054,16 @@ public interface DGPackage extends EPackage {
 	int ELEMENT_KIND = 44;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.TextAnchor <em>Text Anchor</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.dd.dg.TextAnchor
+	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getTextAnchor()
+	 * @generated
+	 */
+	int TEXT_ANCHOR = 45;
+
+	/**
 	 * Returns the meta object for class '
 	 * {@link org.eclipse.papyrus.dd.dg.Canvas <em>Canvas</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -4078,15 +4087,11 @@ public interface DGPackage extends EPackage {
 	EReference getCanvas_Bounds();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Canvas Cannot Have Transforms</em>}' operation. <!-- begin-user-doc
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Canvas Cannot Have Transforms</em>}' operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Canvas Cannot Have Transforms</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>Canvas Cannot Have Transforms</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map();
@@ -4116,6 +4121,17 @@ public interface DGPackage extends EPackage {
 	EReference getGroup_Member();
 
 	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Group#getLayout <em>Layout</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Layout</em>'.
+	 * @see org.eclipse.papyrus.dd.dg.Group#getLayout()
+	 * @see #getGroup()
+	 * @generated
+	 */
+	EAttribute getGroup_Layout();
+
+	/**
 	 * Returns the meta object for class '
 	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement
 	 * <em>Graphical Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
@@ -4128,10 +4144,8 @@ public interface DGPackage extends EPackage {
 	EClass getGraphicalElement();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClipPath
-	 * <em>Clip Path</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClipPath <em>Clip Path</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Clip Path</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getClipPath()
 	 * @see #getGraphicalElement()
@@ -4140,10 +4154,8 @@ public interface DGPackage extends EPackage {
 	EReference getGraphicalElement_ClipPath();
 
 	/**
-	 * Returns the meta object for the container reference '
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup
-	 * <em>Group</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup <em>Group</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the container reference '<em>Group</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup()
 	 * @see #getGraphicalElement()
@@ -4152,10 +4164,8 @@ public interface DGPackage extends EPackage {
 	EReference getGraphicalElement_Group();
 
 	/**
-	 * Returns the meta object for the attribute list '
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClasses
-	 * <em>Class</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClasses <em>Class</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Class</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getClasses()
 	 * @see #getGraphicalElement()
@@ -4164,10 +4174,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getGraphicalElement_Class();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle
-	 * <em>Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle <em>Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Style</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle()
 	 * @see #getGraphicalElement()
@@ -4176,12 +4184,9 @@ public interface DGPackage extends EPackage {
 	EReference getGraphicalElement_Style();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms
-	 * <em>Transform</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '
-	 *         <em>Transform</em>'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms <em>Transform</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Transform</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms()
 	 * @see #getGraphicalElement()
 	 * @generated
@@ -4189,15 +4194,22 @@ public interface DGPackage extends EPackage {
 	EReference getGraphicalElement_Transform();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Referenced Clippath Has Id</em>}' operation. <!-- begin-user-doc -->
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getLayoutData <em>Layout Data</em>}'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Referenced Clippath Has Id</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the attribute '<em>Layout Data</em>'.
+	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getLayoutData()
+	 * @see #getGraphicalElement()
+	 * @generated
+	 */
+	EAttribute getGraphicalElement_LayoutData();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Referenced Clippath Has Id</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Referenced Clippath Has Id</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map();
@@ -4226,14 +4238,11 @@ public interface DGPackage extends EPackage {
 	EAttribute getDefinition_Id();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Id Cannot Be Empty</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Id Cannot Be Empty</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Id Cannot Be Empty</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getDefinition__IdCannotBeEmpty__DiagnosticChain_Map();
@@ -4262,10 +4271,8 @@ public interface DGPackage extends EPackage {
 	EReference getMoveTo_Point();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.PathCommand <em>Path Command</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.PathCommand <em>Path Command</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for class '<em>Path Command</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.PathCommand
 	 * @generated
@@ -4273,10 +4280,8 @@ public interface DGPackage extends EPackage {
 	EClass getPathCommand();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.PathCommand#isRelative
-	 * <em>Is Relative</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.PathCommand#isRelative <em>Is Relative</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Is Relative</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.PathCommand#isRelative()
 	 * @see #getPathCommand()
@@ -4319,10 +4324,8 @@ public interface DGPackage extends EPackage {
 	EReference getStyle_Fill();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity
-	 * <em>Fill Opacity</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity <em>Fill Opacity</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Fill Opacity</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getFillOpacity()
 	 * @see #getStyle()
@@ -4343,10 +4346,8 @@ public interface DGPackage extends EPackage {
 	EReference getStyle_Stroke();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth
-	 * <em>Stroke Width</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth <em>Stroke Width</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Stroke Width</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getStrokeWidth()
 	 * @see #getStyle()
@@ -4355,10 +4356,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyle_StrokeWidth();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity
-	 * <em>Stroke Opacity</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke Opacity</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Stroke Opacity</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity()
 	 * @see #getStyle()
@@ -4381,10 +4380,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyle_StrokeDashLength();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the attribute '<em>Font Size</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getFontSize()
 	 * @see #getStyle()
@@ -4393,10 +4390,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyle_FontSize();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the attribute '<em>Font Name</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getFontName()
 	 * @see #getStyle()
@@ -4405,10 +4400,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyle_FontName();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Font Italic</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#isFontItalic()
 	 * @see #getStyle()
@@ -4417,10 +4410,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyle_FontItalic();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the attribute '<em>Font Bold</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#isFontBold()
 	 * @see #getStyle()
@@ -4429,10 +4420,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyle_FontBold();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration
-	 * <em>Font Decoration</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration <em>Font Decoration</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Font Decoration</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getFontDecoration()
 	 * @see #getStyle()
@@ -4441,68 +4430,51 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyle_FontDecoration();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Font Size</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Style#validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Font Size</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Valid Font Size</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dg.Style#validFontSize(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dg.Style#validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getStyle__ValidFontSize__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Fill Opacity</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Style#validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Fill Opacity</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Valid Fill Opacity</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dg.Style#validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dg.Style#validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getStyle__ValidFillOpacity__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Stroke Width</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Style#validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Stroke Width</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Valid Stroke Width</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dg.Style#validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dg.Style#validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getStyle__ValidStrokeWidth__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Dash Length Size</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Style#validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Dash Length Size</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Valid Dash Length Size</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.Style#validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>Valid Dash Length Size</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.Style#validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getStyle__ValidDashLengthSize__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Stroke Opacity</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Style#validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Stroke Opacity</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Valid Stroke Opacity</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.Style#validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>Valid Stroke Opacity</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.Style#validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getStyle__ValidStrokeOpacity__DiagnosticChain_Map();
@@ -4531,10 +4503,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getPaint_Color();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Paint#getPaintServer
-	 * <em>Paint Server</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.dg.Paint#getPaintServer <em>Paint Server</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Paint Server</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Paint#getPaintServer()
 	 * @see #getPaint()
@@ -4543,24 +4513,18 @@ public interface DGPackage extends EPackage {
 	EReference getPaint_PaintServer();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Referenced Paint Server Has Id</em>}' operation. <!-- begin-user-doc
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Referenced Paint Server Has Id</em>}' operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Referenced Paint Server Has Id</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>Referenced Paint Server Has Id</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.PaintServer <em>Paint Server</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.PaintServer <em>Paint Server</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for class '<em>Paint Server</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.PaintServer
 	 * @generated
@@ -4568,12 +4532,9 @@ public interface DGPackage extends EPackage {
 	EClass getPaintServer();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.papyrus.dd.dg.PaintServer#getTransforms
-	 * <em>Transform</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '
-	 *         <em>Transform</em>'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.PaintServer#getTransforms <em>Transform</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Transform</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.PaintServer#getTransforms()
 	 * @see #getPaintServer()
 	 * @generated
@@ -4627,14 +4588,11 @@ public interface DGPackage extends EPackage {
 	EAttribute getCircle_Radius();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Circle#nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Non Negative Radius</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Circle#nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Radius</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Non Negative Radius</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dg.Circle#nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dg.Circle#nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getCircle__NonNegativeRadius__DiagnosticChain_Map();
@@ -4651,10 +4609,8 @@ public interface DGPackage extends EPackage {
 	EClass getClosePath();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.CubicCurveTo <em>Cubic Curve To</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo <em>Cubic Curve To</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for class '<em>Cubic Curve To</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.CubicCurveTo
 	 * @generated
@@ -4662,10 +4618,8 @@ public interface DGPackage extends EPackage {
 	EClass getCubicCurveTo();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint <em>Point</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint <em>Point</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the containment reference '<em>Point</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint()
 	 * @see #getCubicCurveTo()
@@ -4674,12 +4628,9 @@ public interface DGPackage extends EPackage {
 	EReference getCubicCurveTo_Point();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl
-	 * <em>Start Control</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference '
-	 *         <em>Start Control</em>'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl <em>Start Control</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Start Control</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl()
 	 * @see #getCubicCurveTo()
 	 * @generated
@@ -4687,12 +4638,9 @@ public interface DGPackage extends EPackage {
 	EReference getCubicCurveTo_StartControl();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl
-	 * <em>End Control</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference '
-	 *         <em>End Control</em>'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl <em>End Control</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>End Control</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl()
 	 * @see #getCubicCurveTo()
 	 * @generated
@@ -4711,12 +4659,9 @@ public interface DGPackage extends EPackage {
 	EClass getDefinitions();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.papyrus.dd.dg.Definitions#getDefnitions
-	 * <em>Defnition</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '
-	 *         <em>Defnition</em>'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.Definitions#getDefnitions <em>Defnition</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Defnition</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Definitions#getDefnitions()
 	 * @see #getDefinitions()
 	 * @generated
@@ -4724,12 +4669,9 @@ public interface DGPackage extends EPackage {
 	EReference getDefinitions_Defnition();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet
-	 * <em>Style Sheet</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference '
-	 *         <em>Style Sheet</em>'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet <em>Style Sheet</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Style Sheet</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet()
 	 * @see #getDefinitions()
 	 * @generated
@@ -4748,12 +4690,9 @@ public interface DGPackage extends EPackage {
 	EClass getStyleSheet();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSheet#getRules <em>Rule</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.StyleSheet#getRules <em>Rule</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '<em>Rule</em>
-	 *         '.
+	 * @return the meta object for the containment reference list '<em>Rule</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.StyleSheet#getRules()
 	 * @see #getStyleSheet()
 	 * @generated
@@ -4772,12 +4711,9 @@ public interface DGPackage extends EPackage {
 	EClass getStyleRule();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleRule#getSelectors
-	 * <em>Selector</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '
-	 *         <em>Selector</em>'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.StyleRule#getSelectors <em>Selector</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Selector</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.StyleRule#getSelectors()
 	 * @see #getStyleRule()
 	 * @generated
@@ -4785,10 +4721,8 @@ public interface DGPackage extends EPackage {
 	EReference getStyleRule_Selector();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleRule#getStyle <em>Style</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.StyleRule#getStyle <em>Style</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the containment reference '<em>Style</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.StyleRule#getStyle()
 	 * @see #getStyleRule()
@@ -4797,10 +4731,8 @@ public interface DGPackage extends EPackage {
 	EReference getStyleRule_Style();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSelector <em>Style Selector</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.StyleSelector <em>Style Selector</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for class '<em>Style Selector</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.StyleSelector
 	 * @generated
@@ -4808,10 +4740,8 @@ public interface DGPackage extends EPackage {
 	EClass getStyleSelector();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the attribute '<em>Kind</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.StyleSelector#getKind()
 	 * @see #getStyleSelector()
@@ -4820,10 +4750,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyleSelector_Kind();
 
 	/**
-	 * Returns the meta object for the attribute list '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getClasses <em>Class</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.dd.dg.StyleSelector#getClasses <em>Class</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute list '<em>Class</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.StyleSelector#getClasses()
 	 * @see #getStyleSelector()
@@ -4843,10 +4771,8 @@ public interface DGPackage extends EPackage {
 	EClass getEllipse();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Ellipse#getCenter <em>Center</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Ellipse#getCenter <em>Center</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the containment reference '<em>Center</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Ellipse#getCenter()
 	 * @see #getEllipse()
@@ -4879,10 +4805,8 @@ public interface DGPackage extends EPackage {
 	EClass getEllipticalArcTo();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Point</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint()
 	 * @see #getEllipticalArcTo()
@@ -4891,10 +4815,8 @@ public interface DGPackage extends EPackage {
 	EReference getEllipticalArcTo_Point();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Radii</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii()
 	 * @see #getEllipticalArcTo()
@@ -4903,10 +4825,8 @@ public interface DGPackage extends EPackage {
 	EReference getEllipticalArcTo_Radii();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation
-	 * <em>Rotation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation <em>Rotation</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Rotation</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation()
 	 * @see #getEllipticalArcTo()
@@ -4915,10 +4835,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getEllipticalArcTo_Rotation();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc
-	 * <em>Is Large Arc</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc <em>Is Large Arc</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Is Large Arc</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc()
 	 * @see #getEllipticalArcTo()
@@ -4927,10 +4845,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getEllipticalArcTo_IsLargeArc();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep
-	 * <em>Is Sweep</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep <em>Is Sweep</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Is Sweep</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep()
 	 * @see #getEllipticalArcTo()
@@ -4951,10 +4867,8 @@ public interface DGPackage extends EPackage {
 	EClass getQuadraticCurveTo();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint
-	 * <em>Point</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint <em>Point</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Point</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint()
 	 * @see #getQuadraticCurveTo()
@@ -4963,10 +4877,8 @@ public interface DGPackage extends EPackage {
 	EReference getQuadraticCurveTo_Point();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl
-	 * <em>Control</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl <em>Control</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Control</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl()
 	 * @see #getQuadraticCurveTo()
@@ -4999,10 +4911,8 @@ public interface DGPackage extends EPackage {
 	EReference getGradient_Stop();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop <em>Gradient Stop</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.GradientStop <em>Gradient Stop</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for class '<em>Gradient Stop</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GradientStop
 	 * @generated
@@ -5010,10 +4920,8 @@ public interface DGPackage extends EPackage {
 	EClass getGradientStop();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the attribute '<em>Color</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GradientStop#getColor()
 	 * @see #getGradientStop()
@@ -5022,10 +4930,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getGradientStop_Color();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Offset</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GradientStop#getOffset()
 	 * @see #getGradientStop()
@@ -5034,10 +4940,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getGradientStop_Offset();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity
-	 * <em>Opacity</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity <em>Opacity</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Opacity</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GradientStop#getOpacity()
 	 * @see #getGradientStop()
@@ -5046,27 +4950,21 @@ public interface DGPackage extends EPackage {
 	EAttribute getGradientStop_Opacity();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Offset</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.GradientStop#validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Offset</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Valid Offset</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dg.GradientStop#validOffset(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dg.GradientStop#validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getGradientStop__ValidOffset__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Opacity</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.GradientStop#validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Opacity</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Valid Opacity</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dg.GradientStop#validOpacity(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dg.GradientStop#validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getGradientStop__ValidOpacity__DiagnosticChain_Map();
@@ -5107,13 +5005,10 @@ public interface DGPackage extends EPackage {
 	EReference getImage_Bounds();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Image#isAspectRatioPreserved
-	 * <em>Is Aspect Ratio Preserved</em>}'. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Image#isAspectRatioPreserved <em>Is Aspect Ratio Preserved</em>}'.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return the meta object for the attribute '
-	 *         <em>Is Aspect Ratio Preserved</em>'.
+	 * @return the meta object for the attribute '<em>Is Aspect Ratio Preserved</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Image#isAspectRatioPreserved()
 	 * @see #getImage()
 	 * @generated
@@ -5121,23 +5016,18 @@ public interface DGPackage extends EPackage {
 	EAttribute getImage_IsAspectRatioPreserved();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Source Cannot Be Empty</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Source Cannot Be Empty</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Source Cannot Be Empty</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>Source Cannot Be Empty</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getImage__SourceCannotBeEmpty__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Line
-	 * <em>Line</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Line <em>Line</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Line</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Line
 	 * @generated
@@ -5169,10 +5059,8 @@ public interface DGPackage extends EPackage {
 	EReference getLine_End();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement <em>Marked Element</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.MarkedElement <em>Marked Element</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for class '<em>Marked Element</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.MarkedElement
 	 * @generated
@@ -5180,10 +5068,8 @@ public interface DGPackage extends EPackage {
 	EClass getMarkedElement();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#getEndMarker
-	 * <em>End Marker</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.dg.MarkedElement#getEndMarker <em>End Marker</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>End Marker</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#getEndMarker()
 	 * @see #getMarkedElement()
@@ -5192,10 +5078,8 @@ public interface DGPackage extends EPackage {
 	EReference getMarkedElement_EndMarker();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#getMidMarker
-	 * <em>Mid Marker</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.dg.MarkedElement#getMidMarker <em>Mid Marker</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Mid Marker</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#getMidMarker()
 	 * @see #getMarkedElement()
@@ -5204,10 +5088,8 @@ public interface DGPackage extends EPackage {
 	EReference getMarkedElement_MidMarker();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#getStartMarker
-	 * <em>Start Marker</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.dg.MarkedElement#getStartMarker <em>Start Marker</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Start Marker</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#getStartMarker()
 	 * @see #getMarkedElement()
@@ -5216,43 +5098,31 @@ public interface DGPackage extends EPackage {
 	EReference getMarkedElement_StartMarker();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Referenced Start Marker Has Id</em>}' operation. <!-- begin-user-doc
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Referenced Start Marker Has Id</em>}' operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Referenced Start Marker Has Id</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>Referenced Start Marker Has Id</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Referenced Mid Marker Has Id</em>}' operation. <!-- begin-user-doc
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Referenced Mid Marker Has Id</em>}' operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Referenced Mid Marker Has Id</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>Referenced Mid Marker Has Id</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Referenced End Marker Has Id</em>}' operation. <!-- begin-user-doc
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Referenced End Marker Has Id</em>}' operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Referenced End Marker Has Id</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>Referenced End Marker Has Id</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map();
@@ -5281,12 +5151,9 @@ public interface DGPackage extends EPackage {
 	EReference getMarker_Size();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Marker#getReference <em>Reference</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference '<em>Reference</em>
-	 *         '.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Marker#getReference <em>Reference</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Reference</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Marker#getReference()
 	 * @see #getMarker()
 	 * @generated
@@ -5294,10 +5161,8 @@ public interface DGPackage extends EPackage {
 	EReference getMarker_Reference();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.LinearGradient <em>Linear Gradient</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.LinearGradient <em>Linear Gradient</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Linear Gradient</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.LinearGradient
 	 * @generated
@@ -5305,10 +5170,8 @@ public interface DGPackage extends EPackage {
 	EClass getLinearGradient();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.LinearGradient#getStart <em>Start</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.LinearGradient#getStart <em>Start</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Start</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.LinearGradient#getStart()
 	 * @see #getLinearGradient()
@@ -5317,10 +5180,8 @@ public interface DGPackage extends EPackage {
 	EReference getLinearGradient_Start();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.LinearGradient#getEnd <em>End</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.LinearGradient#getEnd <em>End</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the containment reference '<em>End</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.LinearGradient#getEnd()
 	 * @see #getLinearGradient()
@@ -5329,15 +5190,11 @@ public interface DGPackage extends EPackage {
 	EReference getLinearGradient_End();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.LinearGradient#validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Gradient Vector</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.LinearGradient#validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Gradient Vector</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Valid Gradient Vector</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.LinearGradient#validGradientVector(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>Valid Gradient Vector</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.LinearGradient#validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getLinearGradient__ValidGradientVector__DiagnosticChain_Map();
@@ -5449,9 +5306,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getMatrix_F();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Path
-	 * <em>Path</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Path <em>Path</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Path</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Path
 	 * @generated
@@ -5459,12 +5315,9 @@ public interface DGPackage extends EPackage {
 	EClass getPath();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.papyrus.dd.dg.Path#getCommands <em>Command</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.Path#getCommands <em>Command</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '
-	 *         <em>Command</em>'.
+	 * @return the meta object for the containment reference list '<em>Command</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Path#getCommands()
 	 * @see #getPath()
 	 * @generated
@@ -5472,15 +5325,11 @@ public interface DGPackage extends EPackage {
 	EReference getPath_Command();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>First Command Must Be Move</em>}' operation. <!-- begin-user-doc -->
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>First Command Must Be Move</em>}' operation.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>First Command Must Be Move</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>First Command Must Be Move</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getPath__FirstCommandMustBeMove__DiagnosticChain_Map();
@@ -5497,10 +5346,8 @@ public interface DGPackage extends EPackage {
 	EClass getPattern();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Pattern#getBounds <em>Bounds</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Pattern#getBounds <em>Bounds</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the containment reference '<em>Bounds</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Pattern#getBounds()
 	 * @see #getPattern()
@@ -5556,12 +5403,9 @@ public interface DGPackage extends EPackage {
 	EClass getPolyline();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.papyrus.dd.dg.Polyline#getPoints <em>Point</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.Polyline#getPoints <em>Point</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '
-	 *         <em>Point</em>'.
+	 * @return the meta object for the containment reference list '<em>Point</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Polyline#getPoints()
 	 * @see #getPolyline()
 	 * @generated
@@ -5569,10 +5413,8 @@ public interface DGPackage extends EPackage {
 	EReference getPolyline_Point();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient <em>Radial Gradient</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.RadialGradient <em>Radial Gradient</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Radial Gradient</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RadialGradient
 	 * @generated
@@ -5580,10 +5422,8 @@ public interface DGPackage extends EPackage {
 	EClass getRadialGradient();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#getCenter
-	 * <em>Center</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.RadialGradient#getCenter <em>Center</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Center</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#getCenter()
 	 * @see #getRadialGradient()
@@ -5592,10 +5432,8 @@ public interface DGPackage extends EPackage {
 	EReference getRadialGradient_Center();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#getFocus <em>Focus</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.RadialGradient#getFocus <em>Focus</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the containment reference '<em>Focus</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#getFocus()
 	 * @see #getRadialGradient()
@@ -5604,10 +5442,8 @@ public interface DGPackage extends EPackage {
 	EReference getRadialGradient_Focus();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#getRadius
-	 * <em>Radius</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.RadialGradient#getRadius <em>Radius</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Radius</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#getRadius()
 	 * @see #getRadialGradient()
@@ -5616,40 +5452,31 @@ public interface DGPackage extends EPackage {
 	EAttribute getRadialGradient_Radius();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Center Point</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.RadialGradient#validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Center Point</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Valid Center Point</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getRadialGradient__ValidCenterPoint__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Focus Point</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.RadialGradient#validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Focus Point</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Valid Focus Point</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getRadialGradient__ValidFocusPoint__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Radius</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.RadialGradient#validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Radius</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Valid Radius</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#validRadius(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getRadialGradient__ValidRadius__DiagnosticChain_Map();
@@ -5666,10 +5493,8 @@ public interface DGPackage extends EPackage {
 	EClass getRectangle();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Rectangle#getBounds <em>Bounds</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Rectangle#getBounds <em>Bounds</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the containment reference '<em>Bounds</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Rectangle#getBounds()
 	 * @see #getRectangle()
@@ -5678,10 +5503,8 @@ public interface DGPackage extends EPackage {
 	EReference getRectangle_Bounds();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius
-	 * <em>Corner Radius</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius <em>Corner Radius</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Corner Radius</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius()
 	 * @see #getRectangle()
@@ -5690,15 +5513,11 @@ public interface DGPackage extends EPackage {
 	EAttribute getRectangle_CornerRadius();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Rectangle#nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Non Negative Corner Radius</em>}' operation. <!-- begin-user-doc -->
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Rectangle#nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Corner Radius</em>}' operation.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Non Negative Corner Radius</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.Rectangle#nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>Non Negative Corner Radius</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.Rectangle#nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map();
@@ -5728,12 +5547,9 @@ public interface DGPackage extends EPackage {
 	EAttribute getRootCanvas_BackgroundColor();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions
-	 * <em>Definitions</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference '
-	 *         <em>Definitions</em>'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions <em>Definitions</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Definitions</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions()
 	 * @see #getRootCanvas()
 	 * @generated
@@ -5741,13 +5557,10 @@ public interface DGPackage extends EPackage {
 	EReference getRootCanvas_Definitions();
 
 	/**
-	 * Returns the meta object for the reference list '
-	 * {@link org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets
-	 * <em>External Style Sheet</em>}'. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets <em>External Style Sheet</em>}'.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return the meta object for the reference list '
-	 *         <em>External Style Sheet</em>'.
+	 * @return the meta object for the reference list '<em>External Style Sheet</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets()
 	 * @see #getRootCanvas()
 	 * @generated
@@ -5755,6 +5568,17 @@ public interface DGPackage extends EPackage {
 	EReference getRootCanvas_ExternalStyleSheet();
 
 	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getScripts <em>Script</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute list '<em>Script</em>'.
+	 * @see org.eclipse.papyrus.dd.dg.RootCanvas#getScripts()
+	 * @see #getRootCanvas()
+	 * @generated
+	 */
+	EAttribute getRootCanvas_Script();
+
+	/**
 	 * Returns the meta object for class '
 	 * {@link org.eclipse.papyrus.dd.dg.Rotate <em>Rotate</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -5801,10 +5625,8 @@ public interface DGPackage extends EPackage {
 	EClass getScale();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Scale#getFactorX <em>Factor X</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Scale#getFactorX <em>Factor X</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the attribute '<em>Factor X</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Scale#getFactorX()
 	 * @see #getScale()
@@ -5813,10 +5635,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getScale_FactorX();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Scale#getFactorY <em>Factor Y</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Scale#getFactorY <em>Factor Y</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the attribute '<em>Factor Y</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Scale#getFactorY()
 	 * @see #getScale()
@@ -5825,22 +5645,18 @@ public interface DGPackage extends EPackage {
 	EAttribute getScale_FactorY();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Scale#nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Nonnegativescale</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Scale#nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Nonnegativescale</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return the meta object for the '<em>Nonnegativescale</em>' operation.
-	 * @see org.eclipse.papyrus.dd.dg.Scale#nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see org.eclipse.papyrus.dd.dg.Scale#nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getScale__Nonnegativescale__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Skew
-	 * <em>Skew</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Skew <em>Skew</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Skew</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Skew
 	 * @generated
@@ -5872,9 +5688,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getSkew_AngleY();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Text
-	 * <em>Text</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Text <em>Text</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Text</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Text
 	 * @generated
@@ -5894,12 +5709,9 @@ public interface DGPackage extends EPackage {
 	EAttribute getText_Data();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Text#getPosition <em>Position</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Text#getPosition <em>Position</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference '<em>Position</em>
-	 *         '.
+	 * @return the meta object for the containment reference '<em>Position</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Text#getPosition()
 	 * @see #getText()
 	 * @generated
@@ -5907,15 +5719,22 @@ public interface DGPackage extends EPackage {
 	EReference getText_Position();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Text#dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Data Cannot Be Empty</em>}' operation. <!-- begin-user-doc --> <!--
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Text#getAnchor <em>Anchor</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Anchor</em>'.
+	 * @see org.eclipse.papyrus.dd.dg.Text#getAnchor()
+	 * @see #getText()
+	 * @generated
+	 */
+	EAttribute getText_Anchor();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Text#dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Data Cannot Be Empty</em>}' operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Data Cannot Be Empty</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.Text#dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>Data Cannot Be Empty</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.Text#dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getText__DataCannotBeEmpty__DiagnosticChain_Map();
@@ -5932,10 +5751,8 @@ public interface DGPackage extends EPackage {
 	EClass getTranslate();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Translate#getDeltaX <em>Delta X</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaX <em>Delta X</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the attribute '<em>Delta X</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Translate#getDeltaX()
 	 * @see #getTranslate()
@@ -5944,10 +5761,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getTranslate_DeltaX();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Translate#getDeltaY <em>Delta Y</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaY <em>Delta Y</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for the attribute '<em>Delta Y</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Translate#getDeltaY()
 	 * @see #getTranslate()
@@ -5956,9 +5771,8 @@ public interface DGPackage extends EPackage {
 	EAttribute getTranslate_DeltaY();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Use
-	 * <em>Use</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Use <em>Use</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Use</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Use
 	 * @generated
@@ -5991,24 +5805,18 @@ public interface DGPackage extends EPackage {
 	EReference getUse_ReferencedElement();
 
 	/**
-	 * Returns the meta object for the '
-	 * {@link org.eclipse.papyrus.dd.dg.Use#referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Referenced Element Has Id</em>}' operation. <!-- begin-user-doc -->
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Use#referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Referenced Element Has Id</em>}' operation.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the '<em>Referenced Element Has Id</em>'
-	 *         operation.
-	 * @see org.eclipse.papyrus.dd.dg.Use#referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @return the meta object for the '<em>Referenced Element Has Id</em>' operation.
+	 * @see org.eclipse.papyrus.dd.dg.Use#referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 */
 	EOperation getUse__ReferencedElementHasId__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for enum '
-	 * {@link org.eclipse.papyrus.dd.dg.FontDecoration <em>Font Decoration</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.dd.dg.FontDecoration <em>Font Decoration</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>Font Decoration</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.FontDecoration
 	 * @generated
@@ -6016,10 +5824,8 @@ public interface DGPackage extends EPackage {
 	EEnum getFontDecoration();
 
 	/**
-	 * Returns the meta object for enum '
-	 * {@link org.eclipse.papyrus.dd.dg.ElementKind <em>Element Kind</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.dd.dg.ElementKind <em>Element Kind</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @return the meta object for enum '<em>Element Kind</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.ElementKind
 	 * @generated
@@ -6027,6 +5833,16 @@ public interface DGPackage extends EPackage {
 	EEnum getElementKind();
 
 	/**
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.dd.dg.TextAnchor <em>Text Anchor</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Text Anchor</em>'.
+	 * @see org.eclipse.papyrus.dd.dg.TextAnchor
+	 * @generated
+	 */
+	EEnum getTextAnchor();
+
+	/**
 	 * Returns the factory that creates the instances of the model. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -6046,15 +5862,12 @@ public interface DGPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.CanvasImpl <em>Canvas</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.CanvasImpl <em>Canvas</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.CanvasImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getCanvas()
 		 * @generated
@@ -6062,9 +5875,8 @@ public interface DGPackage extends EPackage {
 		EClass CANVAS = eINSTANCE.getCanvas();
 
 		/**
-		 * The meta object literal for the '<em><b>Bounds</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference CANVAS__BOUNDS = eINSTANCE.getCanvas_Bounds();
@@ -6076,14 +5888,11 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EOperation CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map();
+		EOperation CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.GroupImpl <em>Group</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl <em>Group</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.GroupImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGroup()
 		 * @generated
@@ -6091,19 +5900,24 @@ public interface DGPackage extends EPackage {
 		EClass GROUP = eINSTANCE.getGroup();
 
 		/**
-		 * The meta object literal for the '<em><b>Member</b></em>' containment
-		 * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Member</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference GROUP__MEMBER = eINSTANCE.getGroup_Member();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl
-		 * <em>Graphical Element</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em><b>Layout</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute GROUP__LAYOUT = eINSTANCE.getGroup_Layout();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl <em>Graphical Element</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGraphicalElement()
 		 * @generated
@@ -6111,50 +5925,48 @@ public interface DGPackage extends EPackage {
 		EClass GRAPHICAL_ELEMENT = eINSTANCE.getGraphicalElement();
 
 		/**
-		 * The meta object literal for the '<em><b>Clip Path</b></em>' reference
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Clip Path</b></em>' reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference GRAPHICAL_ELEMENT__CLIP_PATH = eINSTANCE
-				.getGraphicalElement_ClipPath();
+		EReference GRAPHICAL_ELEMENT__CLIP_PATH = eINSTANCE.getGraphicalElement_ClipPath();
 
 		/**
-		 * The meta object literal for the '<em><b>Group</b></em>' container
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Group</b></em>' container reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference GRAPHICAL_ELEMENT__GROUP = eINSTANCE
-				.getGraphicalElement_Group();
+		EReference GRAPHICAL_ELEMENT__GROUP = eINSTANCE.getGraphicalElement_Group();
 
 		/**
-		 * The meta object literal for the '<em><b>Class</b></em>' attribute
-		 * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Class</b></em>' attribute list feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute GRAPHICAL_ELEMENT__CLASS = eINSTANCE
-				.getGraphicalElement_Class();
+		EAttribute GRAPHICAL_ELEMENT__CLASS = eINSTANCE.getGraphicalElement_Class();
 
 		/**
-		 * The meta object literal for the '<em><b>Style</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Style</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference GRAPHICAL_ELEMENT__STYLE = eINSTANCE
-				.getGraphicalElement_Style();
+		EReference GRAPHICAL_ELEMENT__STYLE = eINSTANCE.getGraphicalElement_Style();
 
 		/**
-		 * The meta object literal for the '<em><b>Transform</b></em>'
-		 * containment reference list feature. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em><b>Transform</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @generated
 		 */
-		EReference GRAPHICAL_ELEMENT__TRANSFORM = eINSTANCE
-				.getGraphicalElement_Transform();
+		EReference GRAPHICAL_ELEMENT__TRANSFORM = eINSTANCE.getGraphicalElement_Transform();
+
+		/**
+		 * The meta object literal for the '<em><b>Layout Data</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute GRAPHICAL_ELEMENT__LAYOUT_DATA = eINSTANCE.getGraphicalElement_LayoutData();
 
 		/**
 		 * The meta object literal for the '
@@ -6163,15 +5975,12 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EOperation GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map();
+		EOperation GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE.getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.DefinitionImpl
-		 * <em>Definition</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.DefinitionImpl <em>Definition</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.DefinitionImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getDefinition()
 		 * @generated
@@ -6179,27 +5988,22 @@ public interface DGPackage extends EPackage {
 		EClass DEFINITION = eINSTANCE.getDefinition();
 
 		/**
-		 * The meta object literal for the '<em><b>Id</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute DEFINITION__ID = eINSTANCE.getDefinition_Id();
 
 		/**
-		 * The meta object literal for the '<em><b>Id Cannot Be Empty</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Id Cannot Be Empty</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getDefinition__IdCannotBeEmpty__DiagnosticChain_Map();
+		EOperation DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getDefinition__IdCannotBeEmpty__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.MoveToImpl <em>Move To</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.MoveToImpl <em>Move To</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.MoveToImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMoveTo()
 		 * @generated
@@ -6207,19 +6011,16 @@ public interface DGPackage extends EPackage {
 		EClass MOVE_TO = eINSTANCE.getMoveTo();
 
 		/**
-		 * The meta object literal for the '<em><b>Point</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Point</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference MOVE_TO__POINT = eINSTANCE.getMoveTo_Point();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.PathCommandImpl
-		 * <em>Path Command</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PathCommandImpl <em>Path Command</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.PathCommandImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPathCommand()
 		 * @generated
@@ -6227,13 +6028,11 @@ public interface DGPackage extends EPackage {
 		EClass PATH_COMMAND = eINSTANCE.getPathCommand();
 
 		/**
-		 * The meta object literal for the '<em><b>Is Relative</b></em>'
-		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Is Relative</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute PATH_COMMAND__IS_RELATIVE = eINSTANCE
-				.getPathCommand_IsRelative();
+		EAttribute PATH_COMMAND__IS_RELATIVE = eINSTANCE.getPathCommand_IsRelative();
 
 		/**
 		 * The meta object literal for the '
@@ -6248,10 +6047,8 @@ public interface DGPackage extends EPackage {
 		EClass CLIP_PATH = eINSTANCE.getClipPath();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.StyleImpl <em>Style</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl <em>Style</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.StyleImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyle()
 		 * @generated
@@ -6259,120 +6056,102 @@ public interface DGPackage extends EPackage {
 		EClass STYLE = eINSTANCE.getStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Fill</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Fill</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference STYLE__FILL = eINSTANCE.getStyle_Fill();
 
 		/**
-		 * The meta object literal for the '<em><b>Fill Opacity</b></em>'
-		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Fill Opacity</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute STYLE__FILL_OPACITY = eINSTANCE.getStyle_FillOpacity();
 
 		/**
-		 * The meta object literal for the '<em><b>Stroke</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Stroke</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference STYLE__STROKE = eINSTANCE.getStyle_Stroke();
 
 		/**
-		 * The meta object literal for the '<em><b>Stroke Width</b></em>'
-		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Stroke Width</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute STYLE__STROKE_WIDTH = eINSTANCE.getStyle_StrokeWidth();
 
 		/**
-		 * The meta object literal for the '<em><b>Stroke Opacity</b></em>'
-		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Stroke Opacity</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute STYLE__STROKE_OPACITY = eINSTANCE.getStyle_StrokeOpacity();
 
 		/**
-		 * The meta object literal for the '<em><b>Stroke Dash Length</b></em>'
-		 * attribute list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Stroke Dash Length</b></em>' attribute list feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute STYLE__STROKE_DASH_LENGTH = eINSTANCE
-				.getStyle_StrokeDashLength();
+		EAttribute STYLE__STROKE_DASH_LENGTH = eINSTANCE.getStyle_StrokeDashLength();
 
 		/**
-		 * The meta object literal for the '<em><b>Font Size</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Font Size</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute STYLE__FONT_SIZE = eINSTANCE.getStyle_FontSize();
 
 		/**
-		 * The meta object literal for the '<em><b>Font Name</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Font Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute STYLE__FONT_NAME = eINSTANCE.getStyle_FontName();
 
 		/**
-		 * The meta object literal for the '<em><b>Font Italic</b></em>'
-		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Font Italic</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute STYLE__FONT_ITALIC = eINSTANCE.getStyle_FontItalic();
 
 		/**
-		 * The meta object literal for the '<em><b>Font Bold</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Font Bold</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute STYLE__FONT_BOLD = eINSTANCE.getStyle_FontBold();
 
 		/**
-		 * The meta object literal for the '<em><b>Font Decoration</b></em>'
-		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Font Decoration</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute STYLE__FONT_DECORATION = eINSTANCE.getStyle_FontDecoration();
 
 		/**
-		 * The meta object literal for the '<em><b>Valid Font Size</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Valid Font Size</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getStyle__ValidFontSize__DiagnosticChain_Map();
+		EOperation STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getStyle__ValidFontSize__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '<em><b>Valid Fill Opacity</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Valid Fill Opacity</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getStyle__ValidFillOpacity__DiagnosticChain_Map();
+		EOperation STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getStyle__ValidFillOpacity__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '<em><b>Valid Stroke Width</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Valid Stroke Width</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getStyle__ValidStrokeWidth__DiagnosticChain_Map();
+		EOperation STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE.getStyle__ValidStrokeWidth__DiagnosticChain_Map();
 
 		/**
 		 * The meta object literal for the '
@@ -6381,23 +6160,18 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EOperation STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getStyle__ValidDashLengthSize__DiagnosticChain_Map();
+		EOperation STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getStyle__ValidDashLengthSize__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '<em><b>Valid Stroke Opacity</b></em>
-		 * ' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Valid Stroke Opacity</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getStyle__ValidStrokeOpacity__DiagnosticChain_Map();
+		EOperation STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getStyle__ValidStrokeOpacity__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.PaintImpl <em>Paint</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PaintImpl <em>Paint</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.PaintImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPaint()
 		 * @generated
@@ -6405,17 +6179,15 @@ public interface DGPackage extends EPackage {
 		EClass PAINT = eINSTANCE.getPaint();
 
 		/**
-		 * The meta object literal for the '<em><b>Color</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Color</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute PAINT__COLOR = eINSTANCE.getPaint_Color();
 
 		/**
-		 * The meta object literal for the '<em><b>Paint Server</b></em>'
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Paint Server</b></em>' reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference PAINT__PAINT_SERVER = eINSTANCE.getPaint_PaintServer();
@@ -6427,15 +6199,12 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EOperation PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map();
+		EOperation PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE.getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.PaintServerImpl
-		 * <em>Paint Server</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PaintServerImpl <em>Paint Server</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.PaintServerImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPaintServer()
 		 * @generated
@@ -6443,14 +6212,12 @@ public interface DGPackage extends EPackage {
 		EClass PAINT_SERVER = eINSTANCE.getPaintServer();
 
 		/**
-		 * The meta object literal for the '<em><b>Transform</b></em>'
-		 * containment reference list feature. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em><b>Transform</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @generated
 		 */
-		EReference PAINT_SERVER__TRANSFORM = eINSTANCE
-				.getPaintServer_Transform();
+		EReference PAINT_SERVER__TRANSFORM = eINSTANCE.getPaintServer_Transform();
 
 		/**
 		 * The meta object literal for the '
@@ -6465,10 +6232,8 @@ public interface DGPackage extends EPackage {
 		EClass TRANSFORM = eINSTANCE.getTransform();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.CircleImpl <em>Circle</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.CircleImpl <em>Circle</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.CircleImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getCircle()
 		 * @generated
@@ -6476,36 +6241,30 @@ public interface DGPackage extends EPackage {
 		EClass CIRCLE = eINSTANCE.getCircle();
 
 		/**
-		 * The meta object literal for the '<em><b>Center</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Center</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference CIRCLE__CENTER = eINSTANCE.getCircle_Center();
 
 		/**
-		 * The meta object literal for the '<em><b>Radius</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Radius</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute CIRCLE__RADIUS = eINSTANCE.getCircle_Radius();
 
 		/**
-		 * The meta object literal for the '<em><b>Non Negative Radius</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Non Negative Radius</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getCircle__NonNegativeRadius__DiagnosticChain_Map();
+		EOperation CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getCircle__NonNegativeRadius__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.ClosePathImpl
-		 * <em>Close Path</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.ClosePathImpl <em>Close Path</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.ClosePathImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getClosePath()
 		 * @generated
@@ -6513,11 +6272,9 @@ public interface DGPackage extends EPackage {
 		EClass CLOSE_PATH = eINSTANCE.getClosePath();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl
-		 * <em>Cubic Curve To</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl <em>Cubic Curve To</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getCubicCurveTo()
 		 * @generated
@@ -6525,39 +6282,32 @@ public interface DGPackage extends EPackage {
 		EClass CUBIC_CURVE_TO = eINSTANCE.getCubicCurveTo();
 
 		/**
-		 * The meta object literal for the '<em><b>Point</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Point</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference CUBIC_CURVE_TO__POINT = eINSTANCE.getCubicCurveTo_Point();
 
 		/**
-		 * The meta object literal for the '<em><b>Start Control</b></em>'
-		 * containment reference feature. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em><b>Start Control</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @generated
 		 */
-		EReference CUBIC_CURVE_TO__START_CONTROL = eINSTANCE
-				.getCubicCurveTo_StartControl();
+		EReference CUBIC_CURVE_TO__START_CONTROL = eINSTANCE.getCubicCurveTo_StartControl();
 
 		/**
-		 * The meta object literal for the '<em><b>End Control</b></em>'
-		 * containment reference feature. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em><b>End Control</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @generated
 		 */
-		EReference CUBIC_CURVE_TO__END_CONTROL = eINSTANCE
-				.getCubicCurveTo_EndControl();
+		EReference CUBIC_CURVE_TO__END_CONTROL = eINSTANCE.getCubicCurveTo_EndControl();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl
-		 * <em>Definitions</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl <em>Definitions</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getDefinitions()
 		 * @generated
@@ -6565,31 +6315,25 @@ public interface DGPackage extends EPackage {
 		EClass DEFINITIONS = eINSTANCE.getDefinitions();
 
 		/**
-		 * The meta object literal for the '<em><b>Defnition</b></em>'
-		 * containment reference list feature. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em><b>Defnition</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @generated
 		 */
-		EReference DEFINITIONS__DEFNITION = eINSTANCE
-				.getDefinitions_Defnition();
+		EReference DEFINITIONS__DEFNITION = eINSTANCE.getDefinitions_Defnition();
 
 		/**
-		 * The meta object literal for the '<em><b>Style Sheet</b></em>'
-		 * containment reference feature. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em><b>Style Sheet</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @generated
 		 */
-		EReference DEFINITIONS__STYLE_SHEET = eINSTANCE
-				.getDefinitions_StyleSheet();
+		EReference DEFINITIONS__STYLE_SHEET = eINSTANCE.getDefinitions_StyleSheet();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl
-		 * <em>Style Sheet</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl <em>Style Sheet</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyleSheet()
 		 * @generated
@@ -6597,19 +6341,16 @@ public interface DGPackage extends EPackage {
 		EClass STYLE_SHEET = eINSTANCE.getStyleSheet();
 
 		/**
-		 * The meta object literal for the '<em><b>Rule</b></em>' containment
-		 * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Rule</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference STYLE_SHEET__RULE = eINSTANCE.getStyleSheet_Rule();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl
-		 * <em>Style Rule</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl <em>Style Rule</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyleRule()
 		 * @generated
@@ -6617,28 +6358,24 @@ public interface DGPackage extends EPackage {
 		EClass STYLE_RULE = eINSTANCE.getStyleRule();
 
 		/**
-		 * The meta object literal for the '<em><b>Selector</b></em>'
-		 * containment reference list feature. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em><b>Selector</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @generated
 		 */
 		EReference STYLE_RULE__SELECTOR = eINSTANCE.getStyleRule_Selector();
 
 		/**
-		 * The meta object literal for the '<em><b>Style</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Style</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference STYLE_RULE__STYLE = eINSTANCE.getStyleRule_Style();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl
-		 * <em>Style Selector</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl <em>Style Selector</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyleSelector()
 		 * @generated
@@ -6646,26 +6383,22 @@ public interface DGPackage extends EPackage {
 		EClass STYLE_SELECTOR = eINSTANCE.getStyleSelector();
 
 		/**
-		 * The meta object literal for the '<em><b>Kind</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute STYLE_SELECTOR__KIND = eINSTANCE.getStyleSelector_Kind();
 
 		/**
-		 * The meta object literal for the '<em><b>Class</b></em>' attribute
-		 * list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Class</b></em>' attribute list feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute STYLE_SELECTOR__CLASS = eINSTANCE.getStyleSelector_Class();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl <em>Ellipse</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl <em>Ellipse</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.EllipseImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getEllipse()
 		 * @generated
@@ -6673,27 +6406,23 @@ public interface DGPackage extends EPackage {
 		EClass ELLIPSE = eINSTANCE.getEllipse();
 
 		/**
-		 * The meta object literal for the '<em><b>Center</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Center</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference ELLIPSE__CENTER = eINSTANCE.getEllipse_Center();
 
 		/**
-		 * The meta object literal for the '<em><b>Radii</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Radii</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference ELLIPSE__RADII = eINSTANCE.getEllipse_Radii();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl
-		 * <em>Elliptical Arc To</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl <em>Elliptical Arc To</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getEllipticalArcTo()
 		 * @generated
@@ -6701,56 +6430,44 @@ public interface DGPackage extends EPackage {
 		EClass ELLIPTICAL_ARC_TO = eINSTANCE.getEllipticalArcTo();
 
 		/**
-		 * The meta object literal for the '<em><b>Point</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Point</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference ELLIPTICAL_ARC_TO__POINT = eINSTANCE
-				.getEllipticalArcTo_Point();
+		EReference ELLIPTICAL_ARC_TO__POINT = eINSTANCE.getEllipticalArcTo_Point();
 
 		/**
-		 * The meta object literal for the '<em><b>Radii</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Radii</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference ELLIPTICAL_ARC_TO__RADII = eINSTANCE
-				.getEllipticalArcTo_Radii();
+		EReference ELLIPTICAL_ARC_TO__RADII = eINSTANCE.getEllipticalArcTo_Radii();
 
 		/**
-		 * The meta object literal for the '<em><b>Rotation</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Rotation</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute ELLIPTICAL_ARC_TO__ROTATION = eINSTANCE
-				.getEllipticalArcTo_Rotation();
+		EAttribute ELLIPTICAL_ARC_TO__ROTATION = eINSTANCE.getEllipticalArcTo_Rotation();
 
 		/**
-		 * The meta object literal for the '<em><b>Is Large Arc</b></em>'
-		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Is Large Arc</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute ELLIPTICAL_ARC_TO__IS_LARGE_ARC = eINSTANCE
-				.getEllipticalArcTo_IsLargeArc();
+		EAttribute ELLIPTICAL_ARC_TO__IS_LARGE_ARC = eINSTANCE.getEllipticalArcTo_IsLargeArc();
 
 		/**
-		 * The meta object literal for the '<em><b>Is Sweep</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Is Sweep</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute ELLIPTICAL_ARC_TO__IS_SWEEP = eINSTANCE
-				.getEllipticalArcTo_IsSweep();
+		EAttribute ELLIPTICAL_ARC_TO__IS_SWEEP = eINSTANCE.getEllipticalArcTo_IsSweep();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl
-		 * <em>Quadratic Curve To</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl <em>Quadratic Curve To</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getQuadraticCurveTo()
 		 * @generated
@@ -6758,28 +6475,22 @@ public interface DGPackage extends EPackage {
 		EClass QUADRATIC_CURVE_TO = eINSTANCE.getQuadraticCurveTo();
 
 		/**
-		 * The meta object literal for the '<em><b>Point</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Point</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference QUADRATIC_CURVE_TO__POINT = eINSTANCE
-				.getQuadraticCurveTo_Point();
+		EReference QUADRATIC_CURVE_TO__POINT = eINSTANCE.getQuadraticCurveTo_Point();
 
 		/**
-		 * The meta object literal for the '<em><b>Control</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Control</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference QUADRATIC_CURVE_TO__CONTROL = eINSTANCE
-				.getQuadraticCurveTo_Control();
+		EReference QUADRATIC_CURVE_TO__CONTROL = eINSTANCE.getQuadraticCurveTo_Control();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.GradientImpl <em>Gradient</em>}
-		 * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.GradientImpl <em>Gradient</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.GradientImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGradient()
 		 * @generated
@@ -6787,19 +6498,16 @@ public interface DGPackage extends EPackage {
 		EClass GRADIENT = eINSTANCE.getGradient();
 
 		/**
-		 * The meta object literal for the '<em><b>Stop</b></em>' containment
-		 * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Stop</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference GRADIENT__STOP = eINSTANCE.getGradient_Stop();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl
-		 * <em>Gradient Stop</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl <em>Gradient Stop</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.GradientStopImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGradientStop()
 		 * @generated
@@ -6807,52 +6515,43 @@ public interface DGPackage extends EPackage {
 		EClass GRADIENT_STOP = eINSTANCE.getGradientStop();
 
 		/**
-		 * The meta object literal for the '<em><b>Color</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Color</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute GRADIENT_STOP__COLOR = eINSTANCE.getGradientStop_Color();
 
 		/**
-		 * The meta object literal for the '<em><b>Offset</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Offset</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute GRADIENT_STOP__OFFSET = eINSTANCE.getGradientStop_Offset();
 
 		/**
-		 * The meta object literal for the '<em><b>Opacity</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Opacity</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute GRADIENT_STOP__OPACITY = eINSTANCE.getGradientStop_Opacity();
 
 		/**
-		 * The meta object literal for the '<em><b>Valid Offset</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Valid Offset</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getGradientStop__ValidOffset__DiagnosticChain_Map();
+		EOperation GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP = eINSTANCE.getGradientStop__ValidOffset__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '<em><b>Valid Opacity</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Valid Opacity</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getGradientStop__ValidOpacity__DiagnosticChain_Map();
+		EOperation GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getGradientStop__ValidOpacity__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.ImageImpl <em>Image</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl <em>Image</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.ImageImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getImage()
 		 * @generated
@@ -6860,17 +6559,15 @@ public interface DGPackage extends EPackage {
 		EClass IMAGE = eINSTANCE.getImage();
 
 		/**
-		 * The meta object literal for the '<em><b>Source</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Source</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute IMAGE__SOURCE = eINSTANCE.getImage_Source();
 
 		/**
-		 * The meta object literal for the '<em><b>Bounds</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference IMAGE__BOUNDS = eINSTANCE.getImage_Bounds();
@@ -6882,8 +6579,7 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EAttribute IMAGE__IS_ASPECT_RATIO_PRESERVED = eINSTANCE
-				.getImage_IsAspectRatioPreserved();
+		EAttribute IMAGE__IS_ASPECT_RATIO_PRESERVED = eINSTANCE.getImage_IsAspectRatioPreserved();
 
 		/**
 		 * The meta object literal for the '
@@ -6892,14 +6588,11 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EOperation IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getImage__SourceCannotBeEmpty__DiagnosticChain_Map();
+		EOperation IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getImage__SourceCannotBeEmpty__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.LineImpl <em>Line</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.LineImpl <em>Line</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.LineImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getLine()
 		 * @generated
@@ -6907,27 +6600,23 @@ public interface DGPackage extends EPackage {
 		EClass LINE = eINSTANCE.getLine();
 
 		/**
-		 * The meta object literal for the '<em><b>Start</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Start</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference LINE__START = eINSTANCE.getLine_Start();
 
 		/**
-		 * The meta object literal for the '<em><b>End</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>End</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference LINE__END = eINSTANCE.getLine_End();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl
-		 * <em>Marked Element</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl <em>Marked Element</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMarkedElement()
 		 * @generated
@@ -6935,31 +6624,25 @@ public interface DGPackage extends EPackage {
 		EClass MARKED_ELEMENT = eINSTANCE.getMarkedElement();
 
 		/**
-		 * The meta object literal for the '<em><b>End Marker</b></em>'
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>End Marker</b></em>' reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MARKED_ELEMENT__END_MARKER = eINSTANCE
-				.getMarkedElement_EndMarker();
+		EReference MARKED_ELEMENT__END_MARKER = eINSTANCE.getMarkedElement_EndMarker();
 
 		/**
-		 * The meta object literal for the '<em><b>Mid Marker</b></em>'
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Mid Marker</b></em>' reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MARKED_ELEMENT__MID_MARKER = eINSTANCE
-				.getMarkedElement_MidMarker();
+		EReference MARKED_ELEMENT__MID_MARKER = eINSTANCE.getMarkedElement_MidMarker();
 
 		/**
-		 * The meta object literal for the '<em><b>Start Marker</b></em>'
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Start Marker</b></em>' reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference MARKED_ELEMENT__START_MARKER = eINSTANCE
-				.getMarkedElement_StartMarker();
+		EReference MARKED_ELEMENT__START_MARKER = eINSTANCE.getMarkedElement_StartMarker();
 
 		/**
 		 * The meta object literal for the '
@@ -6968,8 +6651,7 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EOperation MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map();
+		EOperation MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE.getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map();
 
 		/**
 		 * The meta object literal for the '
@@ -6978,8 +6660,7 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EOperation MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map();
+		EOperation MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE.getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map();
 
 		/**
 		 * The meta object literal for the '
@@ -6988,14 +6669,11 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EOperation MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map();
+		EOperation MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE.getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl <em>Marker</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl <em>Marker</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.MarkerImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMarker()
 		 * @generated
@@ -7003,28 +6681,24 @@ public interface DGPackage extends EPackage {
 		EClass MARKER = eINSTANCE.getMarker();
 
 		/**
-		 * The meta object literal for the '<em><b>Size</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Size</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference MARKER__SIZE = eINSTANCE.getMarker_Size();
 
 		/**
-		 * The meta object literal for the '<em><b>Reference</b></em>'
-		 * containment reference feature. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em><b>Reference</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @generated
 		 */
 		EReference MARKER__REFERENCE = eINSTANCE.getMarker_Reference();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl
-		 * <em>Linear Gradient</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl <em>Linear Gradient</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getLinearGradient()
 		 * @generated
@@ -7032,36 +6706,30 @@ public interface DGPackage extends EPackage {
 		EClass LINEAR_GRADIENT = eINSTANCE.getLinearGradient();
 
 		/**
-		 * The meta object literal for the '<em><b>Start</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Start</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference LINEAR_GRADIENT__START = eINSTANCE.getLinearGradient_Start();
 
 		/**
-		 * The meta object literal for the '<em><b>End</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>End</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference LINEAR_GRADIENT__END = eINSTANCE.getLinearGradient_End();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>Valid Gradient Vector</b></em>' operation. <!-- begin-user-doc
+		 * The meta object literal for the '<em><b>Valid Gradient Vector</b></em>' operation.
+		 * <!-- begin-user-doc
 		 * --> <!-- end-user-doc -->
-		 * 
 		 * @generated
 		 */
-		EOperation LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getLinearGradient__ValidGradientVector__DiagnosticChain_Map();
+		EOperation LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP = eINSTANCE.getLinearGradient__ValidGradientVector__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.LineToImpl <em>Line To</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.LineToImpl <em>Line To</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.LineToImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getLineTo()
 		 * @generated
@@ -7069,18 +6737,15 @@ public interface DGPackage extends EPackage {
 		EClass LINE_TO = eINSTANCE.getLineTo();
 
 		/**
-		 * The meta object literal for the '<em><b>Point</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Point</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference LINE_TO__POINT = eINSTANCE.getLineTo_Point();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl <em>Matrix</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl <em>Matrix</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.MatrixImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMatrix()
 		 * @generated
@@ -7088,58 +6753,50 @@ public interface DGPackage extends EPackage {
 		EClass MATRIX = eINSTANCE.getMatrix();
 
 		/**
-		 * The meta object literal for the '<em><b>A</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>A</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute MATRIX__A = eINSTANCE.getMatrix_A();
 
 		/**
-		 * The meta object literal for the '<em><b>B</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>B</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute MATRIX__B = eINSTANCE.getMatrix_B();
 
 		/**
-		 * The meta object literal for the '<em><b>C</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>C</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute MATRIX__C = eINSTANCE.getMatrix_C();
 
 		/**
-		 * The meta object literal for the '<em><b>D</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>D</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute MATRIX__D = eINSTANCE.getMatrix_D();
 
 		/**
-		 * The meta object literal for the '<em><b>E</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>E</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute MATRIX__E = eINSTANCE.getMatrix_E();
 
 		/**
-		 * The meta object literal for the '<em><b>F</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>F</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute MATRIX__F = eINSTANCE.getMatrix_F();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.PathImpl <em>Path</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PathImpl <em>Path</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.PathImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPath()
 		 * @generated
@@ -7147,9 +6804,8 @@ public interface DGPackage extends EPackage {
 		EClass PATH = eINSTANCE.getPath();
 
 		/**
-		 * The meta object literal for the '<em><b>Command</b></em>' containment
-		 * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Command</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference PATH__COMMAND = eINSTANCE.getPath_Command();
@@ -7161,14 +6817,11 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EOperation PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getPath__FirstCommandMustBeMove__DiagnosticChain_Map();
+		EOperation PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getPath__FirstCommandMustBeMove__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.PatternImpl <em>Pattern</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PatternImpl <em>Pattern</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.PatternImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPattern()
 		 * @generated
@@ -7176,26 +6829,22 @@ public interface DGPackage extends EPackage {
 		EClass PATTERN = eINSTANCE.getPattern();
 
 		/**
-		 * The meta object literal for the '<em><b>Bounds</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference PATTERN__BOUNDS = eINSTANCE.getPattern_Bounds();
 
 		/**
-		 * The meta object literal for the '<em><b>Tile</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Tile</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference PATTERN__TILE = eINSTANCE.getPattern_Tile();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.PolygonImpl <em>Polygon</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PolygonImpl <em>Polygon</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.PolygonImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPolygon()
 		 * @generated
@@ -7203,18 +6852,15 @@ public interface DGPackage extends EPackage {
 		EClass POLYGON = eINSTANCE.getPolygon();
 
 		/**
-		 * The meta object literal for the '<em><b>Point</b></em>' containment
-		 * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Point</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference POLYGON__POINT = eINSTANCE.getPolygon_Point();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.PolylineImpl <em>Polyline</em>}
-		 * ' class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PolylineImpl <em>Polyline</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.PolylineImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPolyline()
 		 * @generated
@@ -7222,19 +6868,16 @@ public interface DGPackage extends EPackage {
 		EClass POLYLINE = eINSTANCE.getPolyline();
 
 		/**
-		 * The meta object literal for the '<em><b>Point</b></em>' containment
-		 * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Point</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference POLYLINE__POINT = eINSTANCE.getPolyline_Point();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl
-		 * <em>Radial Gradient</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl <em>Radial Gradient</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getRadialGradient()
 		 * @generated
@@ -7242,57 +6885,46 @@ public interface DGPackage extends EPackage {
 		EClass RADIAL_GRADIENT = eINSTANCE.getRadialGradient();
 
 		/**
-		 * The meta object literal for the '<em><b>Center</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Center</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference RADIAL_GRADIENT__CENTER = eINSTANCE
-				.getRadialGradient_Center();
+		EReference RADIAL_GRADIENT__CENTER = eINSTANCE.getRadialGradient_Center();
 
 		/**
-		 * The meta object literal for the '<em><b>Focus</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Focus</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference RADIAL_GRADIENT__FOCUS = eINSTANCE.getRadialGradient_Focus();
 
 		/**
-		 * The meta object literal for the '<em><b>Radius</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Radius</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute RADIAL_GRADIENT__RADIUS = eINSTANCE
-				.getRadialGradient_Radius();
+		EAttribute RADIAL_GRADIENT__RADIUS = eINSTANCE.getRadialGradient_Radius();
 
 		/**
-		 * The meta object literal for the '<em><b>Valid Center Point</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Valid Center Point</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getRadialGradient__ValidCenterPoint__DiagnosticChain_Map();
+		EOperation RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRadialGradient__ValidCenterPoint__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '<em><b>Valid Focus Point</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Valid Focus Point</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getRadialGradient__ValidFocusPoint__DiagnosticChain_Map();
+		EOperation RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRadialGradient__ValidFocusPoint__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '<em><b>Valid Radius</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Valid Radius</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getRadialGradient__ValidRadius__DiagnosticChain_Map();
+		EOperation RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRadialGradient__ValidRadius__DiagnosticChain_Map();
 
 		/**
 		 * The meta object literal for the '
@@ -7307,21 +6939,18 @@ public interface DGPackage extends EPackage {
 		EClass RECTANGLE = eINSTANCE.getRectangle();
 
 		/**
-		 * The meta object literal for the '<em><b>Bounds</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference RECTANGLE__BOUNDS = eINSTANCE.getRectangle_Bounds();
 
 		/**
-		 * The meta object literal for the '<em><b>Corner Radius</b></em>'
-		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Corner Radius</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute RECTANGLE__CORNER_RADIUS = eINSTANCE
-				.getRectangle_CornerRadius();
+		EAttribute RECTANGLE__CORNER_RADIUS = eINSTANCE.getRectangle_CornerRadius();
 
 		/**
 		 * The meta object literal for the '
@@ -7330,15 +6959,12 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EOperation RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map();
+		EOperation RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl
-		 * <em>Root Canvas</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl <em>Root Canvas</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getRootCanvas()
 		 * @generated
@@ -7346,23 +6972,19 @@ public interface DGPackage extends EPackage {
 		EClass ROOT_CANVAS = eINSTANCE.getRootCanvas();
 
 		/**
-		 * The meta object literal for the '<em><b>Background Color</b></em>'
-		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Background Color</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute ROOT_CANVAS__BACKGROUND_COLOR = eINSTANCE
-				.getRootCanvas_BackgroundColor();
+		EAttribute ROOT_CANVAS__BACKGROUND_COLOR = eINSTANCE.getRootCanvas_BackgroundColor();
 
 		/**
-		 * The meta object literal for the '<em><b>Definitions</b></em>'
-		 * containment reference feature. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em><b>Definitions</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @generated
 		 */
-		EReference ROOT_CANVAS__DEFINITIONS = eINSTANCE
-				.getRootCanvas_Definitions();
+		EReference ROOT_CANVAS__DEFINITIONS = eINSTANCE.getRootCanvas_Definitions();
 
 		/**
 		 * The meta object literal for the '<em><b>External Style Sheet</b></em>
@@ -7371,14 +6993,19 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EReference ROOT_CANVAS__EXTERNAL_STYLE_SHEET = eINSTANCE
-				.getRootCanvas_ExternalStyleSheet();
+		EReference ROOT_CANVAS__EXTERNAL_STYLE_SHEET = eINSTANCE.getRootCanvas_ExternalStyleSheet();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.RotateImpl <em>Rotate</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Script</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute ROOT_CANVAS__SCRIPT = eINSTANCE.getRootCanvas_Script();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.RotateImpl <em>Rotate</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.RotateImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getRotate()
 		 * @generated
@@ -7386,26 +7013,22 @@ public interface DGPackage extends EPackage {
 		EClass ROTATE = eINSTANCE.getRotate();
 
 		/**
-		 * The meta object literal for the '<em><b>Angle</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Angle</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute ROTATE__ANGLE = eINSTANCE.getRotate_Angle();
 
 		/**
-		 * The meta object literal for the '<em><b>Center</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Center</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference ROTATE__CENTER = eINSTANCE.getRotate_Center();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl <em>Scale</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl <em>Scale</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.impl.ScaleImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getScale()
 		 * @generated
@@ -7413,35 +7036,29 @@ public interface DGPackage extends EPackage {
 		EClass SCALE = eINSTANCE.getScale();
 
 		/**
-		 * The meta object literal for the '<em><b>Factor X</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Factor X</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute SCALE__FACTOR_X = eINSTANCE.getScale_FactorX();
 
 		/**
-		 * The meta object literal for the '<em><b>Factor Y</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Factor Y</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute SCALE__FACTOR_Y = eINSTANCE.getScale_FactorY();
 
 		/**
-		 * The meta object literal for the '<em><b>Nonnegativescale</b></em>'
-		 * operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Nonnegativescale</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getScale__Nonnegativescale__DiagnosticChain_Map();
+		EOperation SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getScale__Nonnegativescale__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.SkewImpl <em>Skew</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.SkewImpl <em>Skew</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.SkewImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getSkew()
 		 * @generated
@@ -7449,26 +7066,22 @@ public interface DGPackage extends EPackage {
 		EClass SKEW = eINSTANCE.getSkew();
 
 		/**
-		 * The meta object literal for the '<em><b>Angle X</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Angle X</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute SKEW__ANGLE_X = eINSTANCE.getSkew_AngleX();
 
 		/**
-		 * The meta object literal for the '<em><b>Angle Y</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Angle Y</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute SKEW__ANGLE_Y = eINSTANCE.getSkew_AngleY();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.TextImpl <em>Text</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.TextImpl <em>Text</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.TextImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getText()
 		 * @generated
@@ -7476,30 +7089,34 @@ public interface DGPackage extends EPackage {
 		EClass TEXT = eINSTANCE.getText();
 
 		/**
-		 * The meta object literal for the '<em><b>Data</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Data</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute TEXT__DATA = eINSTANCE.getText_Data();
 
 		/**
-		 * The meta object literal for the '<em><b>Position</b></em>'
-		 * containment reference feature. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em><b>Position</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @generated
 		 */
 		EReference TEXT__POSITION = eINSTANCE.getText_Position();
 
 		/**
-		 * The meta object literal for the '<em><b>Data Cannot Be Empty</b></em>
-		 * ' operation. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Anchor</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EOperation TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getText__DataCannotBeEmpty__DiagnosticChain_Map();
+		EAttribute TEXT__ANCHOR = eINSTANCE.getText_Anchor();
+
+		/**
+		 * The meta object literal for the '<em><b>Data Cannot Be Empty</b></em>' operation.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getText__DataCannotBeEmpty__DiagnosticChain_Map();
 
 		/**
 		 * The meta object literal for the '
@@ -7514,26 +7131,22 @@ public interface DGPackage extends EPackage {
 		EClass TRANSLATE = eINSTANCE.getTranslate();
 
 		/**
-		 * The meta object literal for the '<em><b>Delta X</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Delta X</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute TRANSLATE__DELTA_X = eINSTANCE.getTranslate_DeltaX();
 
 		/**
-		 * The meta object literal for the '<em><b>Delta Y</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Delta Y</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute TRANSLATE__DELTA_Y = eINSTANCE.getTranslate_DeltaY();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.UseImpl <em>Use</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.UseImpl <em>Use</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.UseImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getUse()
 		 * @generated
@@ -7541,21 +7154,18 @@ public interface DGPackage extends EPackage {
 		EClass USE = eINSTANCE.getUse();
 
 		/**
-		 * The meta object literal for the '<em><b>Bounds</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference USE__BOUNDS = eINSTANCE.getUse_Bounds();
 
 		/**
-		 * The meta object literal for the '<em><b>Referenced Element</b></em>'
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Referenced Element</b></em>' reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference USE__REFERENCED_ELEMENT = eINSTANCE
-				.getUse_ReferencedElement();
+		EReference USE__REFERENCED_ELEMENT = eINSTANCE.getUse_ReferencedElement();
 
 		/**
 		 * The meta object literal for the '
@@ -7564,15 +7174,12 @@ public interface DGPackage extends EPackage {
 		 * 
 		 * @generated
 		 */
-		EOperation USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE
-				.getUse__ReferencedElementHasId__DiagnosticChain_Map();
+		EOperation USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE.getUse__ReferencedElementHasId__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.FontDecoration
-		 * <em>Font Decoration</em>}' enum. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.FontDecoration <em>Font Decoration</em>}' enum.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.dg.FontDecoration
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getFontDecoration()
 		 * @generated
@@ -7580,16 +7187,24 @@ public interface DGPackage extends EPackage {
 		EEnum FONT_DECORATION = eINSTANCE.getFontDecoration();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.ElementKind <em>Element Kind</em>}'
-		 * enum. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.ElementKind <em>Element Kind</em>}' enum.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.dg.ElementKind
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getElementKind()
 		 * @generated
 		 */
 		EEnum ELEMENT_KIND = eINSTANCE.getElementKind();
 
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.TextAnchor <em>Text Anchor</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.dd.dg.TextAnchor
+		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getTextAnchor()
+		 * @generated
+		 */
+		EEnum TEXT_ANCHOR = eINSTANCE.getTextAnchor();
+
 	}
 
 } // DGPackage
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java
index ecadd73bdd5..2a025cbbb9b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java
@@ -18,14 +18,14 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Definition</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Definition#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Definition#getId <em>Id</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getDefinition()
  * @model abstract="true"
  * @generated
@@ -46,11 +46,9 @@ public interface Definition extends EObject {
 	String getId();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Definition#getId
-	 * <em>Id</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Id</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Definition#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
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java
index d84d3ca0421..af071d48561 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java
@@ -18,17 +18,15 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Definitions</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getDefnitions <em>Defnition
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet <em>Style
- * Sheet</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getDefnitions <em>Defnition</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet <em>Style Sheet</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getDefinitions()
  * @model
  * @generated
@@ -64,14 +62,10 @@ public interface Definitions extends EObject {
 	StyleSheet getStyleSheet();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet
-	 * <em>Style Sheet</em>}' containment reference. <!-- begin-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet <em>Style Sheet</em>}' containment reference.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Style Sheet</em>' containment
-	 *            reference.
+	 * @param value the new value of the '<em>Style Sheet</em>' containment reference.
 	 * @see #getStyleSheet()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java
index 1e6ea7ae2c3..a7c7fee32aa 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java
@@ -21,16 +21,15 @@ import org.eclipse.emf.common.util.Enumerator;
  * <!-- begin-user-doc --> A representation of the literals of the enumeration '
  * <em><b>Element Kind</b></em>', and utility methods for working with them.
  * <!-- end-user-doc -->
- * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getElementKind()
  * @model
  * @generated
  */
 public enum ElementKind implements Enumerator {
 	/**
-	 * The '<em><b>Canvas</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Canvas</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #CANVAS_VALUE
 	 * @generated
 	 * @ordered
@@ -38,9 +37,9 @@ public enum ElementKind implements Enumerator {
 	CANVAS(0, "canvas", "canvas"),
 
 	/**
-	 * The '<em><b>Circle</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Circle</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #CIRCLE_VALUE
 	 * @generated
 	 * @ordered
@@ -48,9 +47,9 @@ public enum ElementKind implements Enumerator {
 	CIRCLE(1, "circle", "circle"),
 
 	/**
-	 * The '<em><b>Clip Path</b></em>' literal object. <!-- begin-user-doc -->
+	 * The '<em><b>Clip Path</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #CLIP_PATH_VALUE
 	 * @generated
 	 * @ordered
@@ -58,9 +57,9 @@ public enum ElementKind implements Enumerator {
 	CLIP_PATH(2, "clipPath", "clipPath"),
 
 	/**
-	 * The '<em><b>Ellipse</b></em>' literal object. <!-- begin-user-doc -->
+	 * The '<em><b>Ellipse</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #ELLIPSE_VALUE
 	 * @generated
 	 * @ordered
@@ -68,9 +67,9 @@ public enum ElementKind implements Enumerator {
 	ELLIPSE(3, "ellipse", "ellipse"),
 
 	/**
-	 * The '<em><b>Group</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Group</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #GROUP_VALUE
 	 * @generated
 	 * @ordered
@@ -78,9 +77,9 @@ public enum ElementKind implements Enumerator {
 	GROUP(4, "group", "group"),
 
 	/**
-	 * The '<em><b>Image</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Image</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #IMAGE_VALUE
 	 * @generated
 	 * @ordered
@@ -88,9 +87,9 @@ public enum ElementKind implements Enumerator {
 	IMAGE(5, "image", "image"),
 
 	/**
-	 * The '<em><b>Line</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Line</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #LINE_VALUE
 	 * @generated
 	 * @ordered
@@ -98,9 +97,9 @@ public enum ElementKind implements Enumerator {
 	LINE(6, "line", "line"),
 
 	/**
-	 * The '<em><b>Marker</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Marker</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #MARKER_VALUE
 	 * @generated
 	 * @ordered
@@ -108,9 +107,9 @@ public enum ElementKind implements Enumerator {
 	MARKER(7, "marker", "marker"),
 
 	/**
-	 * The '<em><b>Path</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Path</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #PATH_VALUE
 	 * @generated
 	 * @ordered
@@ -118,9 +117,9 @@ public enum ElementKind implements Enumerator {
 	PATH(8, "path", "path"),
 
 	/**
-	 * The '<em><b>Polygon</b></em>' literal object. <!-- begin-user-doc -->
+	 * The '<em><b>Polygon</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #POLYGON_VALUE
 	 * @generated
 	 * @ordered
@@ -128,9 +127,9 @@ public enum ElementKind implements Enumerator {
 	POLYGON(9, "polygon", "polygon"),
 
 	/**
-	 * The '<em><b>Polyline</b></em>' literal object. <!-- begin-user-doc -->
+	 * The '<em><b>Polyline</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #POLYLINE_VALUE
 	 * @generated
 	 * @ordered
@@ -138,9 +137,9 @@ public enum ElementKind implements Enumerator {
 	POLYLINE(10, "polyline", "polyline"),
 
 	/**
-	 * The '<em><b>Rectangle</b></em>' literal object. <!-- begin-user-doc -->
+	 * The '<em><b>Rectangle</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #RECTANGLE_VALUE
 	 * @generated
 	 * @ordered
@@ -148,9 +147,9 @@ public enum ElementKind implements Enumerator {
 	RECTANGLE(11, "rectangle", "rectangle"),
 
 	/**
-	 * The '<em><b>Text</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Text</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #TEXT_VALUE
 	 * @generated
 	 * @ordered
@@ -158,9 +157,9 @@ public enum ElementKind implements Enumerator {
 	TEXT(12, "text", "text"),
 
 	/**
-	 * The '<em><b>Use</b></em>' literal object. <!-- begin-user-doc --> <!--
+	 * The '<em><b>Use</b></em>' literal object.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #USE_VALUE
 	 * @generated
 	 * @ordered
@@ -168,13 +167,13 @@ public enum ElementKind implements Enumerator {
 	USE(13, "use", "use");
 
 	/**
-	 * The '<em><b>Canvas</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Canvas</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Canvas</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #CANVAS
 	 * @model name="canvas"
 	 * @generated
@@ -183,13 +182,13 @@ public enum ElementKind implements Enumerator {
 	public static final int CANVAS_VALUE = 0;
 
 	/**
-	 * The '<em><b>Circle</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Circle</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Circle</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #CIRCLE
 	 * @model name="circle"
 	 * @generated
@@ -198,13 +197,13 @@ public enum ElementKind implements Enumerator {
 	public static final int CIRCLE_VALUE = 1;
 
 	/**
-	 * The '<em><b>Clip Path</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Clip Path</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Clip Path</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #CLIP_PATH
 	 * @model name="clipPath"
 	 * @generated
@@ -213,13 +212,13 @@ public enum ElementKind implements Enumerator {
 	public static final int CLIP_PATH_VALUE = 2;
 
 	/**
-	 * The '<em><b>Ellipse</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Ellipse</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Ellipse</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #ELLIPSE
 	 * @model name="ellipse"
 	 * @generated
@@ -228,13 +227,13 @@ public enum ElementKind implements Enumerator {
 	public static final int ELLIPSE_VALUE = 3;
 
 	/**
-	 * The '<em><b>Group</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Group</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Group</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #GROUP
 	 * @model name="group"
 	 * @generated
@@ -243,13 +242,13 @@ public enum ElementKind implements Enumerator {
 	public static final int GROUP_VALUE = 4;
 
 	/**
-	 * The '<em><b>Image</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Image</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Image</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #IMAGE
 	 * @model name="image"
 	 * @generated
@@ -258,13 +257,13 @@ public enum ElementKind implements Enumerator {
 	public static final int IMAGE_VALUE = 5;
 
 	/**
-	 * The '<em><b>Line</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Line</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Line</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #LINE
 	 * @model name="line"
 	 * @generated
@@ -273,13 +272,13 @@ public enum ElementKind implements Enumerator {
 	public static final int LINE_VALUE = 6;
 
 	/**
-	 * The '<em><b>Marker</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Marker</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Marker</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #MARKER
 	 * @model name="marker"
 	 * @generated
@@ -288,13 +287,13 @@ public enum ElementKind implements Enumerator {
 	public static final int MARKER_VALUE = 7;
 
 	/**
-	 * The '<em><b>Path</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Path</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Path</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #PATH
 	 * @model name="path"
 	 * @generated
@@ -303,13 +302,13 @@ public enum ElementKind implements Enumerator {
 	public static final int PATH_VALUE = 8;
 
 	/**
-	 * The '<em><b>Polygon</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Polygon</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Polygon</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #POLYGON
 	 * @model name="polygon"
 	 * @generated
@@ -318,13 +317,13 @@ public enum ElementKind implements Enumerator {
 	public static final int POLYGON_VALUE = 9;
 
 	/**
-	 * The '<em><b>Polyline</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Polyline</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Polyline</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #POLYLINE
 	 * @model name="polyline"
 	 * @generated
@@ -333,13 +332,13 @@ public enum ElementKind implements Enumerator {
 	public static final int POLYLINE_VALUE = 10;
 
 	/**
-	 * The '<em><b>Rectangle</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Rectangle</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Rectangle</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #RECTANGLE
 	 * @model name="rectangle"
 	 * @generated
@@ -348,13 +347,13 @@ public enum ElementKind implements Enumerator {
 	public static final int RECTANGLE_VALUE = 11;
 
 	/**
-	 * The '<em><b>Text</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Text</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Text</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #TEXT
 	 * @model name="text"
 	 * @generated
@@ -363,13 +362,13 @@ public enum ElementKind implements Enumerator {
 	public static final int TEXT_VALUE = 12;
 
 	/**
-	 * The '<em><b>Use</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Use</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Use</b></em>' literal object isn't clear, there
 	 * really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #USE
 	 * @model name="use"
 	 * @generated
@@ -384,22 +383,32 @@ public enum ElementKind implements Enumerator {
 	 * @generated
 	 */
 	private static final ElementKind[] VALUES_ARRAY = new ElementKind[] {
-			CANVAS, CIRCLE, CLIP_PATH, ELLIPSE, GROUP, IMAGE, LINE, MARKER,
-			PATH, POLYGON, POLYLINE, RECTANGLE, TEXT, USE, };
-
-	/**
-	 * A public read-only list of all the '<em><b>Element Kind</b></em>'
-	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+			CANVAS,
+			CIRCLE,
+			CLIP_PATH,
+			ELLIPSE,
+			GROUP,
+			IMAGE,
+			LINE,
+			MARKER,
+			PATH,
+			POLYGON,
+			POLYLINE,
+			RECTANGLE,
+			TEXT,
+			USE,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Element Kind</b></em>' enumerators.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final List<ElementKind> VALUES = Collections
-			.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+	public static final List<ElementKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Element Kind</b></em>' literal with the specified
-	 * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the '<em><b>Element Kind</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static ElementKind get(String literal) {
@@ -413,9 +422,8 @@ public enum ElementKind implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Element Kind</b></em>' literal with the specified
-	 * name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the '<em><b>Element Kind</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static ElementKind getByName(String name) {
@@ -429,70 +437,52 @@ public enum ElementKind implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Element Kind</b></em>' literal with the specified
-	 * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the '<em><b>Element Kind</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static ElementKind get(int value) {
 		switch (value) {
-		case CANVAS_VALUE:
-			return CANVAS;
-		case CIRCLE_VALUE:
-			return CIRCLE;
-		case CLIP_PATH_VALUE:
-			return CLIP_PATH;
-		case ELLIPSE_VALUE:
-			return ELLIPSE;
-		case GROUP_VALUE:
-			return GROUP;
-		case IMAGE_VALUE:
-			return IMAGE;
-		case LINE_VALUE:
-			return LINE;
-		case MARKER_VALUE:
-			return MARKER;
-		case PATH_VALUE:
-			return PATH;
-		case POLYGON_VALUE:
-			return POLYGON;
-		case POLYLINE_VALUE:
-			return POLYLINE;
-		case RECTANGLE_VALUE:
-			return RECTANGLE;
-		case TEXT_VALUE:
-			return TEXT;
-		case USE_VALUE:
-			return USE;
+			case CANVAS_VALUE: return CANVAS;
+			case CIRCLE_VALUE: return CIRCLE;
+			case CLIP_PATH_VALUE: return CLIP_PATH;
+			case ELLIPSE_VALUE: return ELLIPSE;
+			case GROUP_VALUE: return GROUP;
+			case IMAGE_VALUE: return IMAGE;
+			case LINE_VALUE: return LINE;
+			case MARKER_VALUE: return MARKER;
+			case PATH_VALUE: return PATH;
+			case POLYGON_VALUE: return POLYGON;
+			case POLYLINE_VALUE: return POLYLINE;
+			case RECTANGLE_VALUE: return RECTANGLE;
+			case TEXT_VALUE: return TEXT;
+			case USE_VALUE: return USE;
 		}
 		return null;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private ElementKind(int value, String name, String literal) {
@@ -503,35 +493,31 @@ public enum ElementKind implements Enumerator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getValue() {
-		return value;
+	  return value;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getName() {
-		return name;
+	  return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-		return literal;
+	  return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string
-	 * representation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java
index cdc94bb8ef9..f2c2876c13c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java
@@ -17,19 +17,19 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Ellipse</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Ellipse is a graphical element that defines an
- * elliptical shape with a given center point and two radii on the x and y axes.
+ *
+ * <!-- begin-model-doc -->
+ * Ellipse is a graphical element that defines an elliptical shape with a given center point and two radii on the x and y axes.
  * <!-- end-model-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Ellipse#getCenter <em>Center</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Ellipse#getRadii <em>Radii</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Ellipse#getCenter <em>Center</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Ellipse#getRadii <em>Radii</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipse()
  * @model
  * @generated
@@ -50,12 +50,9 @@ public interface Ellipse extends GraphicalElement {
 	Point getCenter();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Ellipse#getCenter <em>Center</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Center</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Ellipse#getCenter <em>Center</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Center</em>' containment reference.
 	 * @see #getCenter()
 	 * @generated
 	 */
@@ -76,12 +73,10 @@ public interface Ellipse extends GraphicalElement {
 	Dimension getRadii();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Ellipse#getRadii
-	 * <em>Radii</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Ellipse#getRadii <em>Radii</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Radii</em>' containment reference.
+	 * @param value the new value of the '<em>Radii</em>' containment reference.
 	 * @see #getRadii()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java
index a94a420d1bc..0c1ebb98cb2 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java
@@ -17,23 +17,18 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Elliptical Arc To</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>}
- * </li>
- * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation <em>Rotation
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc <em>Is Large
- * Arc</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep <em>Is Sweep
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>}
- * </li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation <em>Rotation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc <em>Is Large Arc</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep <em>Is Sweep</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalArcTo()
  * @model
  * @generated
@@ -54,12 +49,9 @@ public interface EllipticalArcTo extends PathCommand {
 	Dimension getRadii();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>}
-	 * ' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Radii</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Radii</em>' containment reference.
 	 * @see #getRadii()
 	 * @generated
 	 */
@@ -109,13 +101,10 @@ public interface EllipticalArcTo extends PathCommand {
 	boolean isLargeArc();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc
-	 * <em>Is Large Arc</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc <em>Is Large Arc</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Is Large Arc</em>' attribute.
+	 * @param value the new value of the '<em>Is Large Arc</em>' attribute.
 	 * @see #isLargeArc()
 	 * @generated
 	 */
@@ -163,12 +152,9 @@ public interface EllipticalArcTo extends PathCommand {
 	Point getPoint();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>}
-	 * ' containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Point</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java
index c90e039af48..299a0162a7f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java
@@ -21,16 +21,15 @@ import org.eclipse.emf.common.util.Enumerator;
  * <!-- begin-user-doc --> A representation of the literals of the enumeration '
  * <em><b>Font Decoration</b></em>', and utility methods for working with them.
  * <!-- end-user-doc -->
- * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getFontDecoration()
  * @model
  * @generated
  */
 public enum FontDecoration implements Enumerator {
 	/**
-	 * The '<em><b>Underline</b></em>' literal object. <!-- begin-user-doc -->
+	 * The '<em><b>Underline</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #UNDERLINE_VALUE
 	 * @generated
 	 * @ordered
@@ -38,9 +37,9 @@ public enum FontDecoration implements Enumerator {
 	UNDERLINE(0, "underline", "underline"),
 
 	/**
-	 * The '<em><b>Overline</b></em>' literal object. <!-- begin-user-doc -->
+	 * The '<em><b>Overline</b></em>' literal object.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #OVERLINE_VALUE
 	 * @generated
 	 * @ordered
@@ -48,9 +47,9 @@ public enum FontDecoration implements Enumerator {
 	OVERLINE(1, "overline", "overline"),
 
 	/**
-	 * The '<em><b>Line Through</b></em>' literal object. <!-- begin-user-doc
+	 * The '<em><b>Line Through</b></em>' literal object.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @see #LINE_THROUGH_VALUE
 	 * @generated
 	 * @ordered
@@ -58,13 +57,13 @@ public enum FontDecoration implements Enumerator {
 	LINE_THROUGH(2, "lineThrough", "lineThrough");
 
 	/**
-	 * The '<em><b>Underline</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Underline</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Underline</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #UNDERLINE
 	 * @model name="underline"
 	 * @generated
@@ -73,13 +72,13 @@ public enum FontDecoration implements Enumerator {
 	public static final int UNDERLINE_VALUE = 0;
 
 	/**
-	 * The '<em><b>Overline</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Overline</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Overline</b></em>' literal object isn't clear,
 	 * there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #OVERLINE
 	 * @model name="overline"
 	 * @generated
@@ -88,13 +87,13 @@ public enum FontDecoration implements Enumerator {
 	public static final int OVERLINE_VALUE = 1;
 
 	/**
-	 * The '<em><b>Line Through</b></em>' literal value. <!-- begin-user-doc -->
+	 * The '<em><b>Line Through</b></em>' literal value.
+	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of '<em><b>Line Through</b></em>' literal object isn't
 	 * clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #LINE_THROUGH
 	 * @model name="lineThrough"
 	 * @generated
@@ -109,21 +108,21 @@ public enum FontDecoration implements Enumerator {
 	 * @generated
 	 */
 	private static final FontDecoration[] VALUES_ARRAY = new FontDecoration[] {
-			UNDERLINE, OVERLINE, LINE_THROUGH, };
+			UNDERLINE,
+			OVERLINE,
+			LINE_THROUGH,
+		};
 
 	/**
-	 * A public read-only list of all the '<em><b>Font Decoration</b></em>'
-	 * enumerators. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * A public read-only list of all the '<em><b>Font Decoration</b></em>' enumerators.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
-	public static final List<FontDecoration> VALUES = Collections
-			.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+	public static final List<FontDecoration> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
 
 	/**
-	 * Returns the '<em><b>Font Decoration</b></em>' literal with the specified
-	 * literal value. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the '<em><b>Font Decoration</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static FontDecoration get(String literal) {
@@ -137,9 +136,8 @@ public enum FontDecoration implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Font Decoration</b></em>' literal with the specified
-	 * name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the '<em><b>Font Decoration</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static FontDecoration getByName(String name) {
@@ -153,48 +151,41 @@ public enum FontDecoration implements Enumerator {
 	}
 
 	/**
-	 * Returns the '<em><b>Font Decoration</b></em>' literal with the specified
-	 * integer value. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the '<em><b>Font Decoration</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static FontDecoration get(int value) {
 		switch (value) {
-		case UNDERLINE_VALUE:
-			return UNDERLINE;
-		case OVERLINE_VALUE:
-			return OVERLINE;
-		case LINE_THROUGH_VALUE:
-			return LINE_THROUGH;
+			case UNDERLINE_VALUE: return UNDERLINE;
+			case OVERLINE_VALUE: return OVERLINE;
+			case LINE_THROUGH_VALUE: return LINE_THROUGH;
 		}
 		return null;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private final String literal;
 
 	/**
-	 * Only this class can construct instances. <!-- begin-user-doc --> <!--
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private FontDecoration(int value, String name, String literal) {
@@ -205,35 +196,31 @@ public enum FontDecoration implements Enumerator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public int getValue() {
-		return value;
+	  return value;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getName() {
-		return name;
+	  return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-		return literal;
+	  return literal;
 	}
 
 	/**
-	 * Returns the literal value of the enumerator, which is its string
-	 * representation. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java
index f230538246c..84537aae231 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java
@@ -16,18 +16,18 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Gradient</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Gradient is a kind of paint server that serves a
- * continuously smooth color transition along the gradient range from one color
- * to the next. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Gradient is a kind of paint server that serves a continuously smooth color transition along the gradient range from one color to the next.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Gradient#getStops <em>Stop</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Gradient#getStops <em>Stop</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getGradient()
  * @model abstract="true"
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java
index 35d8c87c8f2..f69cedf130f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java
@@ -22,20 +22,20 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Gradient Stop</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> GradientStop defines a color transition along the
- * distance from a gradient's start to its end offsets. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * GradientStop defines a color transition along the distance from a gradient's start to its end offsets.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity <em>Opacity
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity <em>Opacity</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getGradientStop()
  * @model
  * @generated
@@ -58,12 +58,9 @@ public interface GradientStop extends EObject {
 	Color getColor();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Color</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Color</em>' attribute.
 	 * @see #isSetColor()
 	 * @see #unsetColor()
 	 * @see #getColor()
@@ -72,10 +69,8 @@ public interface GradientStop extends EObject {
 	void setColor(Color value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetColor()
 	 * @see #getColor()
 	 * @see #setColor(Color)
@@ -84,10 +79,8 @@ public interface GradientStop extends EObject {
 	void unsetColor();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}'
-	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Color</em>' attribute is set.
 	 * @see #unsetColor()
 	 * @see #getColor()
@@ -115,12 +108,9 @@ public interface GradientStop extends EObject {
 	double getOffset();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Offset</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Offset</em>' attribute.
 	 * @see #isSetOffset()
 	 * @see #unsetOffset()
 	 * @see #getOffset()
@@ -129,10 +119,8 @@ public interface GradientStop extends EObject {
 	void setOffset(double value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetOffset()
 	 * @see #getOffset()
 	 * @see #setOffset(double)
@@ -141,10 +129,8 @@ public interface GradientStop extends EObject {
 	void unsetOffset();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}'
-	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Offset</em>' attribute is set.
 	 * @see #unsetOffset()
 	 * @see #getOffset()
@@ -200,11 +186,9 @@ public interface GradientStop extends EObject {
 	void unsetOpacity();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity
-	 * <em>Opacity</em>}' attribute is set. <!-- begin-user-doc --> <!--
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity <em>Opacity</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @return whether the value of the '<em>Opacity</em>' attribute is set.
 	 * @see #unsetOpacity()
 	 * @see #getOpacity()
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java
index 493a52a8de9..70aa8145c66 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java
@@ -18,26 +18,23 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Graphical Element</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> GraphicalElement is the abstract superclass of all
- * graphical elements that can be nested in a canvas. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * GraphicalElement is the abstract superclass of all graphical elements that can be nested in a canvas.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClipPath <em>Clip
- * Path</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup <em>Group
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClasses <em>Class
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle <em>Style
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms <em>
- * Transform</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClipPath <em>Clip Path</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup <em>Group</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClasses <em>Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle <em>Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms <em>Transform</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getLayoutData <em>Layout Data</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getGraphicalElement()
  * @model abstract="true"
  * @generated
@@ -87,13 +84,10 @@ public interface GraphicalElement extends Definition {
 	Group getGroup();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup
-	 * <em>Group</em>}' container reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup <em>Group</em>}' container reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Group</em>' container reference.
+	 * @param value the new value of the '<em>Group</em>' container reference.
 	 * @see #getGroup()
 	 * @generated
 	 */
@@ -127,13 +121,10 @@ public interface GraphicalElement extends Definition {
 	Style getStyle();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle
-	 * <em>Style</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle <em>Style</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Style</em>' containment reference.
+	 * @param value the new value of the '<em>Style</em>' containment reference.
 	 * @see #getStyle()
 	 * @generated
 	 */
@@ -154,6 +145,32 @@ public interface GraphicalElement extends Definition {
 	EList<Transform> getTransforms();
 
 	/**
+	 * Returns the value of the '<em><b>Layout Data</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Layout Data</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Layout Data</em>' attribute.
+	 * @see #setLayoutData(String)
+	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getGraphicalElement_LayoutData()
+	 * @model dataType="org.eclipse.papyrus.dd.dc.String" ordered="false"
+	 * @generated
+	 */
+	String getLayoutData();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getLayoutData <em>Layout Data</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Layout Data</em>' attribute.
+	 * @see #getLayoutData()
+	 * @generated
+	 */
+	void setLayoutData(String value);
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java
index d4e82076cda..f246ef20689 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java
@@ -16,17 +16,19 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Group</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Group defines a group of graphical elements that can
- * be styled, clipped and/or transformed together. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Group defines a group of graphical elements that can be styled, clipped and/or transformed together.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Group#getMembers <em>Member</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Group#getMembers <em>Member</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Group#getLayout <em>Layout</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getGroup()
  * @model
  * @generated
@@ -50,4 +52,30 @@ public interface Group extends GraphicalElement {
 	 */
 	EList<GraphicalElement> getMembers();
 
+	/**
+	 * Returns the value of the '<em><b>Layout</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Layout</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Layout</em>' attribute.
+	 * @see #setLayout(String)
+	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getGroup_Layout()
+	 * @model dataType="org.eclipse.papyrus.dd.dc.String" ordered="false"
+	 * @generated
+	 */
+	String getLayout();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Group#getLayout <em>Layout</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Layout</em>' attribute.
+	 * @see #getLayout()
+	 * @generated
+	 */
+	void setLayout(String value);
+
 } // Group
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java
index c0b6cd73b76..1e47addbf8f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java
@@ -18,21 +18,20 @@ import org.eclipse.papyrus.dd.dc.Bounds;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Image</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Image is a graphical element that defines a shape
- * that paints an image with a given URL within given bounds. <!-- end-model-doc
- * -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Image is a graphical element that defines a shape that paints an image with a given URL within given bounds.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Image#getSource <em>Source</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Image#getBounds <em>Bounds</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Image#isAspectRatioPreserved <em>Is
- * Aspect Ratio Preserved</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Image#getSource <em>Source</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Image#getBounds <em>Bounds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Image#isAspectRatioPreserved <em>Is Aspect Ratio Preserved</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getImage()
  * @model
  * @generated
@@ -78,12 +77,10 @@ public interface Image extends GraphicalElement {
 	Bounds getBounds();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Image#getBounds
-	 * <em>Bounds</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Image#getBounds <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Bounds</em>' containment reference.
+	 * @param value the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -106,14 +103,10 @@ public interface Image extends GraphicalElement {
 	boolean isAspectRatioPreserved();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Image#isAspectRatioPreserved
-	 * <em>Is Aspect Ratio Preserved</em>}' attribute. <!-- begin-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Image#isAspectRatioPreserved <em>Is Aspect Ratio Preserved</em>}' attribute.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Is Aspect Ratio Preserved</em>'
-	 *            attribute.
+	 * @param value the new value of the '<em>Is Aspect Ratio Preserved</em>' attribute.
 	 * @see #isAspectRatioPreserved()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java
index de9aac940cc..814b2539d74 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java
@@ -16,18 +16,19 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Line</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Line is a marked element that defines a shape
- * consisting of one straight line between two points. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Line is a marked element that defines a shape consisting of one straight line between two points.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Line#getStart <em>Start</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Line#getEnd <em>End</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Line#getStart <em>Start</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Line#getEnd <em>End</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getLine()
  * @model
  * @generated
@@ -48,12 +49,10 @@ public interface Line extends MarkedElement {
 	Point getStart();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Line#getStart
-	 * <em>Start</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Line#getStart <em>Start</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Start</em>' containment reference.
+	 * @param value the new value of the '<em>Start</em>' containment reference.
 	 * @see #getStart()
 	 * @generated
 	 */
@@ -74,12 +73,10 @@ public interface Line extends MarkedElement {
 	Point getEnd();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Line#getEnd
-	 * <em>End</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Line#getEnd <em>End</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>End</em>' containment reference.
+	 * @param value the new value of the '<em>End</em>' containment reference.
 	 * @see #getEnd()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java
index 6c39ce8cd70..fcbfe9275e7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java
@@ -16,17 +16,18 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Line To</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> LineTo is a kind of path command that draw a
- * straight line from the current point to a new point. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * LineTo is a kind of path command that draw a straight line from the current point to a new point.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.LineTo#getPoint <em>Point</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.LineTo#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getLineTo()
  * @model
  * @generated
@@ -47,12 +48,10 @@ public interface LineTo extends PathCommand {
 	Point getPoint();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.LineTo#getPoint
-	 * <em>Point</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.LineTo#getPoint <em>Point</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Point</em>' containment reference.
+	 * @param value the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java
index 79efbe04ff4..05c6bb31153 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java
@@ -19,19 +19,19 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Linear Gradient</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> LinearGradient is a kind of gradient that fills a
- * graphical element by smoothly changing color values along a vector. <!--
- * end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * LinearGradient is a kind of gradient that fills a graphical element by smoothly changing color values along a vector.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.LinearGradient#getStart <em>Start</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.LinearGradient#getEnd <em>End</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.LinearGradient#getStart <em>Start</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.LinearGradient#getEnd <em>End</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getLinearGradient()
  * @model
  * @generated
@@ -52,12 +52,9 @@ public interface LinearGradient extends Gradient {
 	Point getStart();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.LinearGradient#getStart <em>Start</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Start</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.LinearGradient#getStart <em>Start</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Start</em>' containment reference.
 	 * @see #getStart()
 	 * @generated
 	 */
@@ -78,12 +75,9 @@ public interface LinearGradient extends Gradient {
 	Point getEnd();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.LinearGradient#getEnd <em>End</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>End</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.LinearGradient#getEnd <em>End</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>End</em>' containment reference.
 	 * @see #getEnd()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java
index 8cade9a0e96..ef53179ec9a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java
@@ -17,23 +17,20 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Marked Element</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> MarkedElement is a graphic element that can be
- * decorated at its vertices with markers (e.g. arrowheads). <!-- end-model-doc
- * -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * MarkedElement is a graphic element that can be decorated at its vertices with markers (e.g. arrowheads).
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.MarkedElement#getEndMarker <em>End
- * Marker</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.MarkedElement#getMidMarker <em>Mid
- * Marker</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.MarkedElement#getStartMarker <em>Start
- * Marker</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.MarkedElement#getEndMarker <em>End Marker</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.MarkedElement#getMidMarker <em>Mid Marker</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.MarkedElement#getStartMarker <em>Start Marker</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getMarkedElement()
  * @model abstract="true"
  * @generated
@@ -54,13 +51,10 @@ public interface MarkedElement extends GraphicalElement {
 	Marker getEndMarker();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#getEndMarker
-	 * <em>End Marker</em>}' reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.MarkedElement#getEndMarker <em>End Marker</em>}' reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>End Marker</em>' reference.
+	 * @param value the new value of the '<em>End Marker</em>' reference.
 	 * @see #getEndMarker()
 	 * @generated
 	 */
@@ -81,13 +75,10 @@ public interface MarkedElement extends GraphicalElement {
 	Marker getMidMarker();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#getMidMarker
-	 * <em>Mid Marker</em>}' reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.MarkedElement#getMidMarker <em>Mid Marker</em>}' reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Mid Marker</em>' reference.
+	 * @param value the new value of the '<em>Mid Marker</em>' reference.
 	 * @see #getMidMarker()
 	 * @generated
 	 */
@@ -108,13 +99,10 @@ public interface MarkedElement extends GraphicalElement {
 	Marker getStartMarker();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#getStartMarker
-	 * <em>Start Marker</em>}' reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.MarkedElement#getStartMarker <em>Start Marker</em>}' reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Start Marker</em>' reference.
+	 * @param value the new value of the '<em>Start Marker</em>' reference.
 	 * @see #getStartMarker()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java
index 39ae66ebdd4..110efb53345 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java
@@ -17,19 +17,19 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Marker</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Marker is a kind of group that is used as a
- * decoration (e.g. an arrowhead) for the vertices of a marked graphical
- * element. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Marker is a kind of group that is used as a decoration (e.g. an arrowhead) for the vertices of a marked graphical element.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Marker#getSize <em>Size</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Marker#getReference <em>Reference</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Marker#getSize <em>Size</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Marker#getReference <em>Reference</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getMarker()
  * @model
  * @generated
@@ -49,12 +49,10 @@ public interface Marker extends Group {
 	Dimension getSize();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Marker#getSize
-	 * <em>Size</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Marker#getSize <em>Size</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Size</em>' containment reference.
+	 * @param value the new value of the '<em>Size</em>' containment reference.
 	 * @see #getSize()
 	 * @generated
 	 */
@@ -75,13 +73,9 @@ public interface Marker extends Group {
 	Point getReference();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Marker#getReference <em>Reference</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Reference</em>' containment
-	 *            reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Marker#getReference <em>Reference</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Reference</em>' containment reference.
 	 * @see #getReference()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java
index 4fa188dcfd5..0e82b8dee1f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java
@@ -14,22 +14,23 @@ package org.eclipse.papyrus.dd.dg;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Matrix</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Matrix is a kind of transform that represents any
- * transform operation with a 3x3 transformation matrix. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Matrix is a kind of transform that represents any transform operation with a 3x3 transformation matrix.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getA <em>A</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getB <em>B</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getC <em>C</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getD <em>D</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getE <em>E</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getF <em>F</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getA <em>A</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getB <em>B</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getC <em>C</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getD <em>D</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getE <em>E</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getF <em>F</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getMatrix()
  * @model
  * @generated
@@ -50,11 +51,9 @@ public interface Matrix extends Transform {
 	double getA();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getA
-	 * <em>A</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>A</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getA <em>A</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>A</em>' attribute.
 	 * @see #getA()
 	 * @generated
 	 */
@@ -75,11 +74,9 @@ public interface Matrix extends Transform {
 	double getB();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getB
-	 * <em>B</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>B</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getB <em>B</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>B</em>' attribute.
 	 * @see #getB()
 	 * @generated
 	 */
@@ -100,11 +97,9 @@ public interface Matrix extends Transform {
 	double getC();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getC
-	 * <em>C</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>C</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getC <em>C</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>C</em>' attribute.
 	 * @see #getC()
 	 * @generated
 	 */
@@ -125,11 +120,9 @@ public interface Matrix extends Transform {
 	double getD();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getD
-	 * <em>D</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>D</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getD <em>D</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>D</em>' attribute.
 	 * @see #getD()
 	 * @generated
 	 */
@@ -150,11 +143,9 @@ public interface Matrix extends Transform {
 	double getE();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getE
-	 * <em>E</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>E</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getE <em>E</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>E</em>' attribute.
 	 * @see #getE()
 	 * @generated
 	 */
@@ -175,11 +166,9 @@ public interface Matrix extends Transform {
 	double getF();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getF
-	 * <em>F</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>F</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getF <em>F</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>F</em>' attribute.
 	 * @see #getF()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java
index 8e8bff2219d..9f4187499b4 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java
@@ -16,18 +16,19 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Move To</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> MoveTo is a kind of path command that establishes a
- * new current point in the coordinate system. Definition is an object with an
- * id that can be nested under Definitions. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * MoveTo is a kind of path command that establishes a new current point in the coordinate system.
+ * Definition is an object with an id that can be nested under Definitions.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.MoveTo#getPoint <em>Point</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.MoveTo#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getMoveTo()
  * @model
  * @generated
@@ -47,12 +48,10 @@ public interface MoveTo extends PathCommand {
 	Point getPoint();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.MoveTo#getPoint
-	 * <em>Point</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.MoveTo#getPoint <em>Point</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Point</em>' containment reference.
+	 * @param value the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java
index c3312a82680..cace5f08b11 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java
@@ -20,16 +20,15 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Paint</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Paint#getColor <em>Color</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Paint#getPaintServer <em>Paint Server
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Paint#getColor <em>Color</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Paint#getPaintServer <em>Paint Server</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPaint()
  * @model
  * @generated
@@ -49,11 +48,9 @@ public interface Paint extends EObject {
 	Color getColor();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Paint#getColor
-	 * <em>Color</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Color</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Paint#getColor <em>Color</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Color</em>' attribute.
 	 * @see #getColor()
 	 * @generated
 	 */
@@ -73,13 +70,10 @@ public interface Paint extends EObject {
 	PaintServer getPaintServer();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Paint#getPaintServer
-	 * <em>Paint Server</em>}' reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Paint#getPaintServer <em>Paint Server</em>}' reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Paint Server</em>' reference.
+	 * @param value the new value of the '<em>Paint Server</em>' reference.
 	 * @see #getPaintServer()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java
index 2ed36d090b5..ebd68ff5fe8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java
@@ -16,18 +16,18 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Paint Server</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> PaintServer is the abstract super class of all paint
- * servers, like gradients and patterns <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * PaintServer is the abstract super class of all paint servers, like gradients and patterns
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.PaintServer#getTransforms <em>Transform
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.PaintServer#getTransforms <em>Transform</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPaintServer()
  * @model abstract="true"
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java
index 3ff54bc6a3c..8ae2a3e004d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java
@@ -18,18 +18,18 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Path</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Path is a marked element that defines a custom shape
- * whose geometry is specified with a sequence of path commands. <!--
- * end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Path is a marked element that defines a custom shape whose geometry is specified with a sequence of path commands.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Path#getCommands <em>Command</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Path#getCommands <em>Command</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPath()
  * @model
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java
index 184fe534eb3..48d86483823 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java
@@ -16,19 +16,18 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Path Command</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> PathCommand is the abstract super type of all
- * commands that participate in specifying a path element. <!-- end-model-doc
- * -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * PathCommand is the abstract super type of all commands that participate in specifying a path element.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.PathCommand#isRelative <em>Is Relative
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.PathCommand#isRelative <em>Is Relative</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPathCommand()
  * @model abstract="true"
  * @generated
@@ -52,13 +51,10 @@ public interface PathCommand extends EObject {
 	boolean isRelative();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.PathCommand#isRelative
-	 * <em>Is Relative</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.PathCommand#isRelative <em>Is Relative</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Is Relative</em>' attribute.
+	 * @param value the new value of the '<em>Is Relative</em>' attribute.
 	 * @see #isRelative()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java
index 4f6efd5187c..ca3b91c8dd1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java
@@ -16,19 +16,19 @@ import org.eclipse.papyrus.dd.dc.Bounds;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Pattern</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Pattern is a kind of paint server that paints a
- * graphical element (a tile) repeatedly at fixed intervals in x and y axes to
- * cover the areas to be filled. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Pattern is a kind of paint server that paints a graphical element (a tile) repeatedly at fixed intervals in x and y axes to cover the areas to be filled.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Pattern#getBounds <em>Bounds</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Pattern#getTile <em>Tile</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Pattern#getBounds <em>Bounds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Pattern#getTile <em>Tile</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPattern()
  * @model
  * @generated
@@ -49,12 +49,9 @@ public interface Pattern extends PaintServer {
 	Bounds getBounds();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Pattern#getBounds <em>Bounds</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Bounds</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Pattern#getBounds <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -76,12 +73,10 @@ public interface Pattern extends PaintServer {
 	GraphicalElement getTile();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Pattern#getTile
-	 * <em>Tile</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Pattern#getTile <em>Tile</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Tile</em>' containment reference.
+	 * @param value the new value of the '<em>Tile</em>' containment reference.
 	 * @see #getTile()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java
index 8557101bd98..986e0604b0c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java
@@ -18,18 +18,18 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Polygon</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Polygon is a marked element that defines a closed
- * shape consisting of a sequence of connected straight line segments. <!--
- * end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Polygon is a marked element that defines a closed shape consisting of a sequence of connected straight line segments.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Polygon#getPoints <em>Point</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Polygon#getPoints <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPolygon()
  * @model
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java
index 35031deaff3..c0ca83a2bcf 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java
@@ -18,18 +18,18 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Polyline</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Polyline is a marked element that defines a shape
- * consisting of a sequence of connected straight line segments. <!--
- * end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Polyline is a marked element that defines a shape consisting of a sequence of connected straight line segments.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Polyline#getPoints <em>Point</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Polyline#getPoints <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPolyline()
  * @model
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java
index f5b0a138e0c..1f418823585 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java
@@ -16,23 +16,20 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Quadratic Curve To</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> QuadraticCurveTo is a kind of path command that
- * draws a quadratic b?zier curve from the current point to a new point using a
- * single control point. EllipticalArcTo is a kind of path command that draws an
- * elliptical arc from the current point to a new point in the coordinate
- * system. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * QuadraticCurveTo is a kind of path command that draws a quadratic b?zier curve from the current point to a new point using a single control point.
+ * EllipticalArcTo is a kind of path command that draws an elliptical arc from the current point to a new point in the coordinate system.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl <em>Control
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint <em>Point
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl <em>Control</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getQuadraticCurveTo()
  * @model
  * @generated
@@ -53,13 +50,10 @@ public interface QuadraticCurveTo extends PathCommand {
 	Point getPoint();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint
-	 * <em>Point</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint <em>Point</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Point</em>' containment reference.
+	 * @param value the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
@@ -79,13 +73,10 @@ public interface QuadraticCurveTo extends PathCommand {
 	Point getControl();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl
-	 * <em>Control</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl <em>Control</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Control</em>' containment reference.
+	 * @param value the new value of the '<em>Control</em>' containment reference.
 	 * @see #getControl()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java
index 6c829669207..35235e9d073 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java
@@ -19,22 +19,20 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Radial Gradient</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> RadialGradient is a kind of gradient that fills a
- * graphical element by smoothly changing color values in a circle. <!--
- * end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * RadialGradient is a kind of gradient that fills a graphical element by smoothly changing color values in a circle.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.RadialGradient#getCenter <em>Center
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.RadialGradient#getFocus <em>Focus</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.RadialGradient#getRadius <em>Radius
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.RadialGradient#getCenter <em>Center</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.RadialGradient#getFocus <em>Focus</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.RadialGradient#getRadius <em>Radius</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getRadialGradient()
  * @model
  * @generated
@@ -55,13 +53,10 @@ public interface RadialGradient extends Gradient {
 	Point getCenter();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#getCenter
-	 * <em>Center</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.RadialGradient#getCenter <em>Center</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Center</em>' containment reference.
+	 * @param value the new value of the '<em>Center</em>' containment reference.
 	 * @see #getCenter()
 	 * @generated
 	 */
@@ -82,12 +77,9 @@ public interface RadialGradient extends Gradient {
 	Point getFocus();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#getFocus <em>Focus</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Focus</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.RadialGradient#getFocus <em>Focus</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Focus</em>' containment reference.
 	 * @see #getFocus()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java
index 2f7e4c5d5cd..572c9619502 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java
@@ -18,20 +18,19 @@ import org.eclipse.papyrus.dd.dc.Bounds;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Rectangle</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Rectangle is a graphical element that defines a
- * rectangular shape with given bounds. A rectangle may be given rounded corners
- * by setting its corner radius. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Rectangle#getBounds <em>Bounds</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius <em>Corner
- * Radius</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Rectangle#getBounds <em>Bounds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius <em>Corner Radius</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getRectangle()
  * @model
  * @generated
@@ -52,12 +51,9 @@ public interface Rectangle extends GraphicalElement {
 	Bounds getBounds();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Rectangle#getBounds <em>Bounds</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Bounds</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Rectangle#getBounds <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -82,13 +78,10 @@ public interface Rectangle extends GraphicalElement {
 	double getCornerRadius();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius
-	 * <em>Corner Radius</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius <em>Corner Radius</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Corner Radius</em>' attribute.
+	 * @param value the new value of the '<em>Corner Radius</em>' attribute.
 	 * @see #isSetCornerRadius()
 	 * @see #unsetCornerRadius()
 	 * @see #getCornerRadius()
@@ -97,11 +90,9 @@ public interface Rectangle extends GraphicalElement {
 	void setCornerRadius(double value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius
-	 * <em>Corner Radius</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius <em>Corner Radius</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #isSetCornerRadius()
 	 * @see #getCornerRadius()
 	 * @see #setCornerRadius(double)
@@ -110,13 +101,10 @@ public interface Rectangle extends GraphicalElement {
 	void unsetCornerRadius();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius
-	 * <em>Corner Radius</em>}' attribute is set. <!-- begin-user-doc --> <!--
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius <em>Corner Radius</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return whether the value of the '<em>Corner Radius</em>' attribute is
-	 *         set.
+	 * @return whether the value of the '<em>Corner Radius</em>' attribute is set.
 	 * @see #unsetCornerRadius()
 	 * @see #getCornerRadius()
 	 * @see #setCornerRadius(double)
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java
index 1d55d9a2d4c..5b71af0777c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java
@@ -18,23 +18,21 @@ import org.eclipse.emf.common.util.EList;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Root Canvas</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> RootCanvas is a kind of canvas that represents the
- * root of containment for all graphical elements that render together. <!--
- * end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * RootCanvas is a kind of canvas that represents the root of containment for all graphical elements that render together.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor <em>
- * Background Color</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions <em>
- * Definitions</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets <em>
- * External Style Sheet</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor <em>Background Color</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions <em>Definitions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets <em>External Style Sheet</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getScripts <em>Script</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getRootCanvas()
  * @model
  * @generated
@@ -57,13 +55,10 @@ public interface RootCanvas extends Canvas {
 	Color getBackgroundColor();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor
-	 * <em>Background Color</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor <em>Background Color</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Background Color</em>' attribute.
+	 * @param value the new value of the '<em>Background Color</em>' attribute.
 	 * @see #isSetBackgroundColor()
 	 * @see #unsetBackgroundColor()
 	 * @see #getBackgroundColor()
@@ -72,11 +67,9 @@ public interface RootCanvas extends Canvas {
 	void setBackgroundColor(Color value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor
-	 * <em>Background Color</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor <em>Background Color</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #isSetBackgroundColor()
 	 * @see #getBackgroundColor()
 	 * @see #setBackgroundColor(Color)
@@ -85,13 +78,10 @@ public interface RootCanvas extends Canvas {
 	void unsetBackgroundColor();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor
-	 * <em>Background Color</em>}' attribute is set. <!-- begin-user-doc -->
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor <em>Background Color</em>}' attribute is set.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @return whether the value of the '<em>Background Color</em>' attribute is
-	 *         set.
+	 * @return whether the value of the '<em>Background Color</em>' attribute is set.
 	 * @see #unsetBackgroundColor()
 	 * @see #getBackgroundColor()
 	 * @see #setBackgroundColor(Color)
@@ -114,14 +104,10 @@ public interface RootCanvas extends Canvas {
 	Definitions getDefinitions();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions
-	 * <em>Definitions</em>}' containment reference. <!-- begin-user-doc -->
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions <em>Definitions</em>}' containment reference.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Definitions</em>' containment
-	 *            reference.
+	 * @param value the new value of the '<em>Definitions</em>' containment reference.
 	 * @see #getDefinitions()
 	 * @generated
 	 */
@@ -141,4 +127,20 @@ public interface RootCanvas extends Canvas {
 	 */
 	EList<StyleSheet> getExternalStyleSheets();
 
+	/**
+	 * Returns the value of the '<em><b>Script</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Script</em>' attribute list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Script</em>' attribute list.
+	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getRootCanvas_Script()
+	 * @model dataType="org.eclipse.papyrus.dd.dc.String" ordered="false"
+	 * @generated
+	 */
+	EList<String> getScripts();
+
 } // RootCanvas
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java
index db9d996d830..aad9b1186f8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java
@@ -16,19 +16,19 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Rotate</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Rotate is a kind of transform that rotates a
- * graphical element by a given angle about a given center point in the x-y
- * coordinate system. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Rotate is a kind of transform that rotates a graphical element by a given angle about a given center point in the x-y coordinate system.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Rotate#getAngle <em>Angle</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Rotate#getCenter <em>Center</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Rotate#getAngle <em>Angle</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Rotate#getCenter <em>Center</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getRotate()
  * @model
  * @generated
@@ -51,11 +51,9 @@ public interface Rotate extends Transform {
 	double getAngle();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Rotate#getAngle
-	 * <em>Angle</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Angle</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Rotate#getAngle <em>Angle</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Angle</em>' attribute.
 	 * @see #getAngle()
 	 * @generated
 	 */
@@ -77,12 +75,10 @@ public interface Rotate extends Transform {
 	Point getCenter();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Rotate#getCenter
-	 * <em>Center</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Rotate#getCenter <em>Center</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Center</em>' containment reference.
+	 * @param value the new value of the '<em>Center</em>' containment reference.
 	 * @see #getCenter()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java
index 13a1c1b18e2..e5672f85a5a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java
@@ -18,19 +18,19 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Scale</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Scale is a kind of transform that scales (resizes) a
- * graphical element by a given factor in the x-y coordinate system. <!--
- * end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Scale is a kind of transform that scales (resizes) a graphical element by a given factor in the x-y coordinate system.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Scale#getFactorX <em>Factor X</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Scale#getFactorY <em>Factor Y</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Scale#getFactorX <em>Factor X</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Scale#getFactorY <em>Factor Y</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getScale()
  * @model
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java
index 5257ded8bd1..d668d312e18 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java
@@ -14,19 +14,19 @@ package org.eclipse.papyrus.dd.dg;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Skew</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Skew is a kind of transform that skews (deforms) a
- * graphical element by given angles in the x-y coordinate system. <!--
- * end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Skew is a kind of transform that skews (deforms) a graphical element by given angles in the x-y coordinate system.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Skew#getAngleX <em>Angle X</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Skew#getAngleY <em>Angle Y</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Skew#getAngleX <em>Angle X</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Skew#getAngleY <em>Angle Y</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getSkew()
  * @model
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java
index 7f7f74a2a34..d2d9873e08e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java
@@ -21,33 +21,28 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Style</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Style contains formatting properties that affect the
- * appearance or style of graphical elements. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Style contains formatting properties that affect the appearance or style of graphical elements.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Style#getFill <em>Fill</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity <em>Fill Opacity
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth <em>Stroke Width
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke
- * Opacity</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths <em>Stroke
- * Dash Length</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}
- * </li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration <em>Font
- * Decoration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getFill <em>Fill</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity <em>Fill Opacity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth <em>Stroke Width</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke Opacity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths <em>Stroke Dash Length</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration <em>Font Decoration</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyle()
  * @model
  * @generated
@@ -70,12 +65,10 @@ public interface Style extends EObject {
 	Paint getFill();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFill
-	 * <em>Fill</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFill <em>Fill</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Fill</em>' containment reference.
+	 * @param value the new value of the '<em>Fill</em>' containment reference.
 	 * @see #isSetFill()
 	 * @see #unsetFill()
 	 * @see #getFill()
@@ -84,10 +77,9 @@ public interface Style extends EObject {
 	void setFill(Paint value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFill
-	 * <em>Fill</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFill <em>Fill</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #isSetFill()
 	 * @see #getFill()
 	 * @see #setFill(Paint)
@@ -129,13 +121,10 @@ public interface Style extends EObject {
 	double getFillOpacity();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity
-	 * <em>Fill Opacity</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity <em>Fill Opacity</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Fill Opacity</em>' attribute.
+	 * @param value the new value of the '<em>Fill Opacity</em>' attribute.
 	 * @see #isSetFillOpacity()
 	 * @see #unsetFillOpacity()
 	 * @see #getFillOpacity()
@@ -144,11 +133,9 @@ public interface Style extends EObject {
 	void setFillOpacity(double value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity
-	 * <em>Fill Opacity</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity <em>Fill Opacity</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #isSetFillOpacity()
 	 * @see #getFillOpacity()
 	 * @see #setFillOpacity(double)
@@ -157,13 +144,10 @@ public interface Style extends EObject {
 	void unsetFillOpacity();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity
-	 * <em>Fill Opacity</em>}' attribute is set. <!-- begin-user-doc --> <!--
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity <em>Fill Opacity</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return whether the value of the '<em>Fill Opacity</em>' attribute is
-	 *         set.
+	 * @return whether the value of the '<em>Fill Opacity</em>' attribute is set.
 	 * @see #unsetFillOpacity()
 	 * @see #getFillOpacity()
 	 * @see #setFillOpacity(double)
@@ -188,12 +172,10 @@ public interface Style extends EObject {
 	Paint getStroke();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStroke
-	 * <em>Stroke</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Stroke</em>' containment reference.
+	 * @param value the new value of the '<em>Stroke</em>' containment reference.
 	 * @see #isSetStroke()
 	 * @see #unsetStroke()
 	 * @see #getStroke()
@@ -202,10 +184,8 @@ public interface Style extends EObject {
 	void setStroke(Paint value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetStroke()
 	 * @see #getStroke()
 	 * @see #setStroke(Paint)
@@ -247,13 +227,10 @@ public interface Style extends EObject {
 	double getStrokeWidth();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth
-	 * <em>Stroke Width</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth <em>Stroke Width</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Stroke Width</em>' attribute.
+	 * @param value the new value of the '<em>Stroke Width</em>' attribute.
 	 * @see #isSetStrokeWidth()
 	 * @see #unsetStrokeWidth()
 	 * @see #getStrokeWidth()
@@ -262,11 +239,9 @@ public interface Style extends EObject {
 	void setStrokeWidth(double value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth
-	 * <em>Stroke Width</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth <em>Stroke Width</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #isSetStrokeWidth()
 	 * @see #getStrokeWidth()
 	 * @see #setStrokeWidth(double)
@@ -275,13 +250,10 @@ public interface Style extends EObject {
 	void unsetStrokeWidth();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth
-	 * <em>Stroke Width</em>}' attribute is set. <!-- begin-user-doc --> <!--
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth <em>Stroke Width</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return whether the value of the '<em>Stroke Width</em>' attribute is
-	 *         set.
+	 * @return whether the value of the '<em>Stroke Width</em>' attribute is set.
 	 * @see #unsetStrokeWidth()
 	 * @see #getStrokeWidth()
 	 * @see #setStrokeWidth(double)
@@ -308,13 +280,10 @@ public interface Style extends EObject {
 	double getStrokeOpacity();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity
-	 * <em>Stroke Opacity</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke Opacity</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Stroke Opacity</em>' attribute.
+	 * @param value the new value of the '<em>Stroke Opacity</em>' attribute.
 	 * @see #isSetStrokeOpacity()
 	 * @see #unsetStrokeOpacity()
 	 * @see #getStrokeOpacity()
@@ -323,11 +292,9 @@ public interface Style extends EObject {
 	void setStrokeOpacity(double value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity
-	 * <em>Stroke Opacity</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke Opacity</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #isSetStrokeOpacity()
 	 * @see #getStrokeOpacity()
 	 * @see #setStrokeOpacity(double)
@@ -336,13 +303,10 @@ public interface Style extends EObject {
 	void unsetStrokeOpacity();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity
-	 * <em>Stroke Opacity</em>}' attribute is set. <!-- begin-user-doc --> <!--
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke Opacity</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return whether the value of the '<em>Stroke Opacity</em>' attribute is
-	 *         set.
+	 * @return whether the value of the '<em>Stroke Opacity</em>' attribute is set.
 	 * @see #unsetStrokeOpacity()
 	 * @see #getStrokeOpacity()
 	 * @see #setStrokeOpacity(double)
@@ -371,11 +335,9 @@ public interface Style extends EObject {
 	EList<Double> getStrokeDashLengths();
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths
-	 * <em>Stroke Dash Length</em>}' attribute list. <!-- begin-user-doc -->
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths <em>Stroke Dash Length</em>}' attribute list.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #isSetStrokeDashLengths()
 	 * @see #getStrokeDashLengths()
 	 * @generated
@@ -383,13 +345,10 @@ public interface Style extends EObject {
 	void unsetStrokeDashLengths();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths
-	 * <em>Stroke Dash Length</em>}' attribute list is set. <!-- begin-user-doc
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths <em>Stroke Dash Length</em>}' attribute list is set.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @return whether the value of the '<em>Stroke Dash Length</em>' attribute
-	 *         list is set.
+	 * @return whether the value of the '<em>Stroke Dash Length</em>' attribute list is set.
 	 * @see #unsetStrokeDashLengths()
 	 * @see #getStrokeDashLengths()
 	 * @generated
@@ -414,12 +373,9 @@ public interface Style extends EObject {
 	double getFontSize();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Font Size</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Font Size</em>' attribute.
 	 * @see #isSetFontSize()
 	 * @see #unsetFontSize()
 	 * @see #getFontSize()
@@ -428,10 +384,8 @@ public interface Style extends EObject {
 	void setFontSize(double value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetFontSize()
 	 * @see #getFontSize()
 	 * @see #setFontSize(double)
@@ -440,10 +394,8 @@ public interface Style extends EObject {
 	void unsetFontSize();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}'
-	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Font Size</em>' attribute is set.
 	 * @see #unsetFontSize()
 	 * @see #getFontSize()
@@ -470,12 +422,9 @@ public interface Style extends EObject {
 	String getFontName();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Font Name</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Font Name</em>' attribute.
 	 * @see #isSetFontName()
 	 * @see #unsetFontName()
 	 * @see #getFontName()
@@ -484,10 +433,8 @@ public interface Style extends EObject {
 	void setFontName(String value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetFontName()
 	 * @see #getFontName()
 	 * @see #setFontName(String)
@@ -496,10 +443,8 @@ public interface Style extends EObject {
 	void unsetFontName();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}'
-	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Font Name</em>' attribute is set.
 	 * @see #unsetFontName()
 	 * @see #getFontName()
@@ -526,12 +471,9 @@ public interface Style extends EObject {
 	boolean isFontItalic();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}
-	 * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Font Italic</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Font Italic</em>' attribute.
 	 * @see #isSetFontItalic()
 	 * @see #unsetFontItalic()
 	 * @see #isFontItalic()
@@ -540,10 +482,8 @@ public interface Style extends EObject {
 	void setFontItalic(boolean value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}
-	 * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetFontItalic()
 	 * @see #isFontItalic()
 	 * @see #setFontItalic(boolean)
@@ -552,10 +492,8 @@ public interface Style extends EObject {
 	void unsetFontItalic();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}
-	 * ' attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Font Italic</em>' attribute is set.
 	 * @see #unsetFontItalic()
 	 * @see #isFontItalic()
@@ -596,10 +534,8 @@ public interface Style extends EObject {
 	void setFontBold(boolean value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetFontBold()
 	 * @see #isFontBold()
 	 * @see #setFontBold(boolean)
@@ -608,10 +544,8 @@ public interface Style extends EObject {
 	void unsetFontBold();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}'
-	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Font Bold</em>' attribute is set.
 	 * @see #unsetFontBold()
 	 * @see #isFontBold()
@@ -640,13 +574,10 @@ public interface Style extends EObject {
 	FontDecoration getFontDecoration();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration
-	 * <em>Font Decoration</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration <em>Font Decoration</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Font Decoration</em>' attribute.
+	 * @param value the new value of the '<em>Font Decoration</em>' attribute.
 	 * @see org.eclipse.papyrus.dd.dg.FontDecoration
 	 * @see #isSetFontDecoration()
 	 * @see #unsetFontDecoration()
@@ -656,11 +587,9 @@ public interface Style extends EObject {
 	void setFontDecoration(FontDecoration value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration
-	 * <em>Font Decoration</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration <em>Font Decoration</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #isSetFontDecoration()
 	 * @see #getFontDecoration()
 	 * @see #setFontDecoration(FontDecoration)
@@ -669,13 +598,10 @@ public interface Style extends EObject {
 	void unsetFontDecoration();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration
-	 * <em>Font Decoration</em>}' attribute is set. <!-- begin-user-doc --> <!--
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration <em>Font Decoration</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return whether the value of the '<em>Font Decoration</em>' attribute is
-	 *         set.
+	 * @return whether the value of the '<em>Font Decoration</em>' attribute is set.
 	 * @see #unsetFontDecoration()
 	 * @see #getFontDecoration()
 	 * @see #setFontDecoration(FontDecoration)
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java
index b578f2f4520..640bb279691 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java
@@ -18,16 +18,15 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Style Rule</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.StyleRule#getSelectors <em>Selector
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.StyleRule#getStyle <em>Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.StyleRule#getSelectors <em>Selector</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.StyleRule#getStyle <em>Style</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyleRule()
  * @model
  * @generated
@@ -62,12 +61,9 @@ public interface StyleRule extends EObject {
 	Style getStyle();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleRule#getStyle <em>Style</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Style</em>' containment reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.StyleRule#getStyle <em>Style</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Style</em>' containment reference.
 	 * @see #getStyle()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java
index a659fe231ba..5a7cf3ab67b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java
@@ -17,16 +17,15 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Style Selector</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.StyleSelector#getClasses <em>Class</em>}
- * </li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.StyleSelector#getClasses <em>Class</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyleSelector()
  * @model
  * @generated
@@ -50,12 +49,9 @@ public interface StyleSelector extends EObject {
 	ElementKind getKind();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Kind</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Kind</em>' attribute.
 	 * @see org.eclipse.papyrus.dd.dg.ElementKind
 	 * @see #isSetKind()
 	 * @see #unsetKind()
@@ -65,10 +61,8 @@ public interface StyleSelector extends EObject {
 	void setKind(ElementKind value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSetKind()
 	 * @see #getKind()
 	 * @see #setKind(ElementKind)
@@ -77,10 +71,8 @@ public interface StyleSelector extends EObject {
 	void unsetKind();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}'
-	 * attribute is set. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}' attribute is set.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return whether the value of the '<em>Kind</em>' attribute is set.
 	 * @see #unsetKind()
 	 * @see #getKind()
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java
index 447bfc2c38a..8e39b4e46bc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java
@@ -18,14 +18,14 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Style Sheet</b></em>'. <!-- end-user-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.StyleSheet#getRules <em>Rule</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.StyleSheet#getRules <em>Rule</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyleSheet()
  * @model
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java
index 39288d4c021..bf497e3bd3a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java
@@ -18,18 +18,20 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Text</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Text is a graphical element that defines a shape
- * that renders a character string at a given position. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Text is a graphical element that defines a shape that renders a character string at a given position.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Text#getData <em>Data</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Text#getPosition <em>Position</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Text#getData <em>Data</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Text#getPosition <em>Position</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Text#getAnchor <em>Anchor</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getText()
  * @model
  * @generated
@@ -50,11 +52,9 @@ public interface Text extends GraphicalElement {
 	String getData();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Text#getData
-	 * <em>Data</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Data</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Text#getData <em>Data</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Data</em>' attribute.
 	 * @see #getData()
 	 * @generated
 	 */
@@ -75,19 +75,45 @@ public interface Text extends GraphicalElement {
 	Point getPosition();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Text#getPosition
-	 * <em>Position</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Text#getPosition <em>Position</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Position</em>' containment
-	 *            reference.
+	 * @param value the new value of the '<em>Position</em>' containment reference.
 	 * @see #getPosition()
 	 * @generated
 	 */
 	void setPosition(Point value);
 
 	/**
+	 * Returns the value of the '<em><b>Anchor</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.dd.dg.TextAnchor}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Anchor</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Anchor</em>' attribute.
+	 * @see org.eclipse.papyrus.dd.dg.TextAnchor
+	 * @see #setAnchor(TextAnchor)
+	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getText_Anchor()
+	 * @model ordered="false"
+	 * @generated
+	 */
+	TextAnchor getAnchor();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Text#getAnchor <em>Anchor</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Anchor</em>' attribute.
+	 * @see org.eclipse.papyrus.dd.dg.TextAnchor
+	 * @see #getAnchor()
+	 * @generated
+	 */
+	void setAnchor(TextAnchor value);
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java
new file mode 100644
index 00000000000..80ea8836dc6
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java
@@ -0,0 +1,244 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.dd.dg;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Text Anchor</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.dd.dg.DGPackage#getTextAnchor()
+ * @model
+ * @generated
+ */
+public enum TextAnchor implements Enumerator {
+	/**
+	 * The '<em><b>Start</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #START_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	START(0, "start", "start"),
+
+	/**
+	 * The '<em><b>Middle</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #MIDDLE_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	MIDDLE(1, "middle", "middle"),
+
+	/**
+	 * The '<em><b>End</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #END_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	END(2, "end", "end");
+
+	/**
+	 * The '<em><b>Start</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Start</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #START
+	 * @model name="start"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int START_VALUE = 0;
+
+	/**
+	 * The '<em><b>Middle</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Middle</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #MIDDLE
+	 * @model name="middle"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int MIDDLE_VALUE = 1;
+
+	/**
+	 * The '<em><b>End</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>End</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #END
+	 * @model name="end"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int END_VALUE = 2;
+
+	/**
+	 * An array of all the '<em><b>Text Anchor</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final TextAnchor[] VALUES_ARRAY =
+		new TextAnchor[] {
+			START,
+			MIDDLE,
+			END,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Text Anchor</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<TextAnchor> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Text Anchor</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static TextAnchor get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			TextAnchor result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Text Anchor</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static TextAnchor getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			TextAnchor result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Text Anchor</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static TextAnchor get(int value) {
+		switch (value) {
+			case START_VALUE: return START;
+			case MIDDLE_VALUE: return MIDDLE;
+			case END_VALUE: return END;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private TextAnchor(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //TextAnchor
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Transform.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Transform.java
index 9d67874fabc..c712a7ab3eb 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Transform.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Transform.java
@@ -16,11 +16,12 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Transform</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Transform defines an operation that changes the
- * geometry of a graphical element in a specific way. <!-- end-model-doc -->
- * 
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Transform defines an operation that changes the geometry of a graphical element in a specific way.
+ * <!-- end-model-doc -->
+ *
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getTransform()
  * @model abstract="true"
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java
index 1076fed3730..33a079abb93 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java
@@ -14,19 +14,19 @@ package org.eclipse.papyrus.dd.dg;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Translate</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Translate is a kind of transform that translates
- * (moves) a graphical element by a given delta along the x-y coordinate system.
+ *
+ * <!-- begin-model-doc -->
+ * Translate is a kind of transform that translates (moves) a graphical element by a given delta along the x-y coordinate system.
  * <!-- end-model-doc -->
- * 
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaX <em>Delta X</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaY <em>Delta Y</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaX <em>Delta X</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaY <em>Delta Y</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getTranslate()
  * @model
  * @generated
@@ -48,12 +48,9 @@ public interface Translate extends Transform {
 	double getDeltaX();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Translate#getDeltaX <em>Delta X</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Delta X</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaX <em>Delta X</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Delta X</em>' attribute.
 	 * @see #getDeltaX()
 	 * @generated
 	 */
@@ -75,12 +72,9 @@ public interface Translate extends Transform {
 	double getDeltaY();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Translate#getDeltaY <em>Delta Y</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Delta Y</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaY <em>Delta Y</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Delta Y</em>' attribute.
 	 * @see #getDeltaY()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java
index f27e2d20ce8..58391c1294d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java
@@ -18,20 +18,19 @@ import org.eclipse.papyrus.dd.dc.Bounds;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Use</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Rectangle is a graphical element that defines a
- * rectangular shape with given bounds. A rectangle may be given rounded corners
- * by setting its corner radius. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.Use#getBounds <em>Bounds</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.Use#getReferencedElement <em>Referenced
- * Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Use#getBounds <em>Bounds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.Use#getReferencedElement <em>Referenced Element</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getUse()
  * @model
  * @generated
@@ -52,12 +51,10 @@ public interface Use extends GraphicalElement {
 	Bounds getBounds();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Use#getBounds
-	 * <em>Bounds</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Use#getBounds <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Bounds</em>' containment reference.
+	 * @param value the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -78,13 +75,10 @@ public interface Use extends GraphicalElement {
 	GraphicalElement getReferencedElement();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Use#getReferencedElement
-	 * <em>Referenced Element</em>}' reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Use#getReferencedElement <em>Referenced Element</em>}' reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Referenced Element</em>' reference.
+	 * @param value the new value of the '<em>Referenced Element</em>' reference.
 	 * @see #getReferencedElement()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java
index aabe46debc6..1b1fa05944f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java
@@ -36,18 +36,16 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.CanvasImpl#getBounds <em>Bounds
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.CanvasImpl#getBounds <em>Bounds</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class CanvasImpl extends GroupImpl implements Canvas {
 	/**
-	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -56,7 +54,6 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected CanvasImpl() {
@@ -65,7 +62,6 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,7 +71,6 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -84,7 +79,6 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBounds(Bounds newBounds,
@@ -92,39 +86,28 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.CANVAS__BOUNDS, oldBounds,
-					newBounds);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CANVAS__BOUNDS, oldBounds, newBounds);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
 		if (newBounds != bounds) {
 			NotificationChain msgs = null;
 			if (bounds != null)
-				msgs = ((InternalEObject) bounds).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.CANVAS__BOUNDS,
-						null, msgs);
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CANVAS__BOUNDS, null, msgs);
 			if (newBounds != null)
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.CANVAS__BOUNDS,
-						null, msgs);
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CANVAS__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.CANVAS__BOUNDS, newBounds, newBounds));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CANVAS__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
@@ -142,100 +125,94 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean canvasCannotHaveTransforms(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.CANVAS,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP,
-						CANVAS_CANNOT_HAVE_TRANSFORMS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.CANVAS__CANVAS_CANNOT_HAVE_TRANSFORMS);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.CANVAS,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP,
+				 CANVAS_CANNOT_HAVE_TRANSFORMS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.CANVAS__CANVAS_CANNOT_HAVE_TRANSFORMS);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.CANVAS__BOUNDS:
-			return basicSetBounds(null, msgs);
+			case DGPackage.CANVAS__BOUNDS:
+				return basicSetBounds(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.CANVAS__BOUNDS:
-			return getBounds();
+			case DGPackage.CANVAS__BOUNDS:
+				return getBounds();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.CANVAS__BOUNDS:
-			setBounds((Bounds) newValue);
-			return;
+			case DGPackage.CANVAS__BOUNDS:
+				setBounds((Bounds)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.CANVAS__BOUNDS:
-			setBounds((Bounds) null);
-			return;
+			case DGPackage.CANVAS__BOUNDS:
+				setBounds((Bounds)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.CANVAS__BOUNDS:
-			return bounds != null;
+			case DGPackage.CANVAS__BOUNDS:
+				return bounds != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -243,10 +220,8 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP:
-			return canvasCannotHaveTransforms(
-					(DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP:
+				return canvasCannotHaveTransforms((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java
index cb84047897d..3b066dec347 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java
@@ -40,20 +40,17 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.CircleImpl#getCenter <em>Center
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.CircleImpl#getRadius <em>Radius
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.CircleImpl#getCenter <em>Center</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.CircleImpl#getRadius <em>Radius</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class CircleImpl extends GraphicalElementImpl implements Circle {
 	/**
-	 * The cached value of the '{@link #getCenter() <em>Center</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getCenter() <em>Center</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCenter()
 	 * @generated
 	 * @ordered
@@ -61,9 +58,8 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	protected Point center;
 
 	/**
-	 * The default value of the '{@link #getRadius() <em>Radius</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getRadius() <em>Radius</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getRadius()
 	 * @generated
 	 * @ordered
@@ -73,7 +69,6 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	/**
 	 * The cached value of the '{@link #getRadius() <em>Radius</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getRadius()
 	 * @generated
 	 * @ordered
@@ -82,7 +77,6 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected CircleImpl() {
@@ -91,7 +85,6 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -101,7 +94,6 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getCenter() {
@@ -110,7 +102,6 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetCenter(Point newCenter,
@@ -118,44 +109,32 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 		Point oldCenter = center;
 		center = newCenter;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.CIRCLE__CENTER, oldCenter,
-					newCenter);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CIRCLE__CENTER, oldCenter, newCenter);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setCenter(Point newCenter) {
 		if (newCenter != center) {
 			NotificationChain msgs = null;
 			if (center != null)
-				msgs = ((InternalEObject) center).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.CIRCLE__CENTER,
-						null, msgs);
+				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CIRCLE__CENTER, null, msgs);
 			if (newCenter != null)
-				msgs = ((InternalEObject) newCenter).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.CIRCLE__CENTER,
-						null, msgs);
+				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CIRCLE__CENTER, null, msgs);
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.CIRCLE__CENTER, newCenter, newCenter));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CIRCLE__CENTER, newCenter, newCenter));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getRadius() {
@@ -164,25 +143,20 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setRadius(double newRadius) {
 		double oldRadius = radius;
 		radius = newRadius;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.CIRCLE__RADIUS, oldRadius, radius));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CIRCLE__RADIUS, oldRadius, radius));
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Non Negative Radius</em>}' invariant operation. <!-- begin-user-doc
+	 * The cached validation expression for the '{@link #nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Radius</em>}' invariant operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -190,110 +164,104 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean nonNegativeRadius(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.CIRCLE,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP,
-						NON_NEGATIVE_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.CIRCLE__NON_NEGATIVE_RADIUS);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.CIRCLE,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP,
+				 NON_NEGATIVE_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.CIRCLE__NON_NEGATIVE_RADIUS);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.CIRCLE__CENTER:
-			return basicSetCenter(null, msgs);
+			case DGPackage.CIRCLE__CENTER:
+				return basicSetCenter(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.CIRCLE__CENTER:
-			return getCenter();
-		case DGPackage.CIRCLE__RADIUS:
-			return getRadius();
+			case DGPackage.CIRCLE__CENTER:
+				return getCenter();
+			case DGPackage.CIRCLE__RADIUS:
+				return getRadius();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.CIRCLE__CENTER:
-			setCenter((Point) newValue);
-			return;
-		case DGPackage.CIRCLE__RADIUS:
-			setRadius((Double) newValue);
-			return;
+			case DGPackage.CIRCLE__CENTER:
+				setCenter((Point)newValue);
+				return;
+			case DGPackage.CIRCLE__RADIUS:
+				setRadius((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.CIRCLE__CENTER:
-			setCenter((Point) null);
-			return;
-		case DGPackage.CIRCLE__RADIUS:
-			setRadius(RADIUS_EDEFAULT);
-			return;
+			case DGPackage.CIRCLE__CENTER:
+				setCenter((Point)null);
+				return;
+			case DGPackage.CIRCLE__RADIUS:
+				setRadius(RADIUS_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.CIRCLE__CENTER:
-			return center != null;
-		case DGPackage.CIRCLE__RADIUS:
-			return radius != RADIUS_EDEFAULT;
+			case DGPackage.CIRCLE__CENTER:
+				return center != null;
+			case DGPackage.CIRCLE__RADIUS:
+				return radius != RADIUS_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -301,22 +269,19 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP:
-			return nonNegativeRadius((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP:
+				return nonNegativeRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (radius: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java
index a1ea4dd4b75..025dbcd2ad2 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java
@@ -21,13 +21,12 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
  * <em><b>Clip Path</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class ClipPathImpl extends GroupImpl implements ClipPath {
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected ClipPathImpl() {
@@ -36,7 +35,6 @@ public class ClipPathImpl extends GroupImpl implements ClipPath {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java
index 5e0f01216d1..b1e6ecc5bc3 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java
@@ -21,13 +21,12 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
  * <em><b>Close Path</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public class ClosePathImpl extends PathCommandImpl implements ClosePath {
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected ClosePathImpl() {
@@ -36,7 +35,6 @@ public class ClosePathImpl extends PathCommandImpl implements ClosePath {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java
index 75162e62f87..f868e1aa819 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java
@@ -30,23 +30,19 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getStartControl
- * <em>Start Control</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getEndControl <em>
- * End Control</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getPoint <em>Point
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getStartControl <em>Start Control</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getEndControl <em>End Control</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	/**
-	 * The cached value of the '{@link #getStartControl()
-	 * <em>Start Control</em>}' containment reference. <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getStartControl() <em>Start Control</em>}' containment reference.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getStartControl()
 	 * @generated
 	 * @ordered
@@ -54,9 +50,8 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	protected Point startControl;
 
 	/**
-	 * The cached value of the '{@link #getEndControl() <em>End Control</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getEndControl() <em>End Control</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getEndControl()
 	 * @generated
 	 * @ordered
@@ -64,9 +59,8 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	protected Point endControl;
 
 	/**
-	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getPoint()
 	 * @generated
 	 * @ordered
@@ -75,7 +69,6 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected CubicCurveToImpl() {
@@ -84,7 +77,6 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -94,7 +86,6 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getPoint() {
@@ -103,7 +94,6 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetPoint(Point newPoint,
@@ -111,44 +101,32 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 		Point oldPoint = point;
 		point = newPoint;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.CUBIC_CURVE_TO__POINT,
-					oldPoint, newPoint);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__POINT, oldPoint, newPoint);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setPoint(Point newPoint) {
 		if (newPoint != point) {
 			NotificationChain msgs = null;
 			if (point != null)
-				msgs = ((InternalEObject) point).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.CUBIC_CURVE_TO__POINT, null, msgs);
+				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__POINT, null, msgs);
 			if (newPoint != null)
-				msgs = ((InternalEObject) newPoint).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.CUBIC_CURVE_TO__POINT, null, msgs);
+				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__POINT, null, msgs);
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.CUBIC_CURVE_TO__POINT, newPoint, newPoint));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__POINT, newPoint, newPoint));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getStartControl() {
@@ -157,7 +135,6 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetStartControl(Point newStartControl,
@@ -165,47 +142,32 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 		Point oldStartControl = startControl;
 		startControl = newStartControl;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.CUBIC_CURVE_TO__START_CONTROL,
-					oldStartControl, newStartControl);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__START_CONTROL, oldStartControl, newStartControl);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setStartControl(Point newStartControl) {
 		if (newStartControl != startControl) {
 			NotificationChain msgs = null;
 			if (startControl != null)
-				msgs = ((InternalEObject) startControl).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.CUBIC_CURVE_TO__START_CONTROL,
-						null, msgs);
+				msgs = ((InternalEObject)startControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__START_CONTROL, null, msgs);
 			if (newStartControl != null)
-				msgs = ((InternalEObject) newStartControl).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.CUBIC_CURVE_TO__START_CONTROL,
-						null, msgs);
+				msgs = ((InternalEObject)newStartControl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__START_CONTROL, null, msgs);
 			msgs = basicSetStartControl(newStartControl, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.CUBIC_CURVE_TO__START_CONTROL, newStartControl,
-					newStartControl));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__START_CONTROL, newStartControl, newStartControl));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getEndControl() {
@@ -214,7 +176,6 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetEndControl(Point newEndControl,
@@ -222,137 +183,118 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 		Point oldEndControl = endControl;
 		endControl = newEndControl;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.CUBIC_CURVE_TO__END_CONTROL,
-					oldEndControl, newEndControl);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__END_CONTROL, oldEndControl, newEndControl);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setEndControl(Point newEndControl) {
 		if (newEndControl != endControl) {
 			NotificationChain msgs = null;
 			if (endControl != null)
-				msgs = ((InternalEObject) endControl).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.CUBIC_CURVE_TO__END_CONTROL, null,
-						msgs);
+				msgs = ((InternalEObject)endControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__END_CONTROL, null, msgs);
 			if (newEndControl != null)
-				msgs = ((InternalEObject) newEndControl).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.CUBIC_CURVE_TO__END_CONTROL, null,
-						msgs);
+				msgs = ((InternalEObject)newEndControl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__END_CONTROL, null, msgs);
 			msgs = basicSetEndControl(newEndControl, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.CUBIC_CURVE_TO__END_CONTROL, newEndControl,
-					newEndControl));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__END_CONTROL, newEndControl, newEndControl));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-			return basicSetStartControl(null, msgs);
-		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-			return basicSetEndControl(null, msgs);
-		case DGPackage.CUBIC_CURVE_TO__POINT:
-			return basicSetPoint(null, msgs);
+			case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
+				return basicSetStartControl(null, msgs);
+			case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
+				return basicSetEndControl(null, msgs);
+			case DGPackage.CUBIC_CURVE_TO__POINT:
+				return basicSetPoint(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-			return getStartControl();
-		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-			return getEndControl();
-		case DGPackage.CUBIC_CURVE_TO__POINT:
-			return getPoint();
+			case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
+				return getStartControl();
+			case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
+				return getEndControl();
+			case DGPackage.CUBIC_CURVE_TO__POINT:
+				return getPoint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-			setStartControl((Point) newValue);
-			return;
-		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-			setEndControl((Point) newValue);
-			return;
-		case DGPackage.CUBIC_CURVE_TO__POINT:
-			setPoint((Point) newValue);
-			return;
+			case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
+				setStartControl((Point)newValue);
+				return;
+			case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
+				setEndControl((Point)newValue);
+				return;
+			case DGPackage.CUBIC_CURVE_TO__POINT:
+				setPoint((Point)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-			setStartControl((Point) null);
-			return;
-		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-			setEndControl((Point) null);
-			return;
-		case DGPackage.CUBIC_CURVE_TO__POINT:
-			setPoint((Point) null);
-			return;
+			case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
+				setStartControl((Point)null);
+				return;
+			case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
+				setEndControl((Point)null);
+				return;
+			case DGPackage.CUBIC_CURVE_TO__POINT:
+				setPoint((Point)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-			return startControl != null;
-		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-			return endControl != null;
-		case DGPackage.CUBIC_CURVE_TO__POINT:
-			return point != null;
+			case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
+				return startControl != null;
+			case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
+				return endControl != null;
+			case DGPackage.CUBIC_CURVE_TO__POINT:
+				return point != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java
index 2a27fb3c500..ec605409f3c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java
@@ -25,33 +25,32 @@ import org.eclipse.papyrus.dd.dg.*;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
  * end-user-doc -->
- * 
  * @generated
  */
 public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 	/**
-	 * Creates the default factory implementation. <!-- begin-user-doc --> <!--
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static DGFactory init() {
 		try {
-			DGFactory theDGFactory = (DGFactory) EPackage.Registry.INSTANCE
-					.getEFactory(DGPackage.eNS_URI);
+			DGFactory theDGFactory = (DGFactory)EPackage.Registry.INSTANCE.getEFactory(DGPackage.eNS_URI);
 			if (theDGFactory != null) {
 				return theDGFactory;
 			}
-		} catch (Exception exception) {
+		}
+		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new DGFactoryImpl();
 	}
 
 	/**
-	 * Creates an instance of the factory. <!-- begin-user-doc --> <!--
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DGFactoryImpl() {
@@ -60,129 +59,90 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-		case DGPackage.CANVAS:
-			return createCanvas();
-		case DGPackage.GROUP:
-			return createGroup();
-		case DGPackage.MOVE_TO:
-			return createMoveTo();
-		case DGPackage.CLIP_PATH:
-			return createClipPath();
-		case DGPackage.STYLE:
-			return createStyle();
-		case DGPackage.PAINT:
-			return createPaint();
-		case DGPackage.CIRCLE:
-			return createCircle();
-		case DGPackage.CLOSE_PATH:
-			return createClosePath();
-		case DGPackage.CUBIC_CURVE_TO:
-			return createCubicCurveTo();
-		case DGPackage.DEFINITIONS:
-			return createDefinitions();
-		case DGPackage.STYLE_SHEET:
-			return createStyleSheet();
-		case DGPackage.STYLE_RULE:
-			return createStyleRule();
-		case DGPackage.STYLE_SELECTOR:
-			return createStyleSelector();
-		case DGPackage.ELLIPSE:
-			return createEllipse();
-		case DGPackage.ELLIPTICAL_ARC_TO:
-			return createEllipticalArcTo();
-		case DGPackage.QUADRATIC_CURVE_TO:
-			return createQuadraticCurveTo();
-		case DGPackage.GRADIENT_STOP:
-			return createGradientStop();
-		case DGPackage.IMAGE:
-			return createImage();
-		case DGPackage.LINE:
-			return createLine();
-		case DGPackage.MARKER:
-			return createMarker();
-		case DGPackage.LINEAR_GRADIENT:
-			return createLinearGradient();
-		case DGPackage.LINE_TO:
-			return createLineTo();
-		case DGPackage.MATRIX:
-			return createMatrix();
-		case DGPackage.PATH:
-			return createPath();
-		case DGPackage.PATTERN:
-			return createPattern();
-		case DGPackage.POLYGON:
-			return createPolygon();
-		case DGPackage.POLYLINE:
-			return createPolyline();
-		case DGPackage.RADIAL_GRADIENT:
-			return createRadialGradient();
-		case DGPackage.RECTANGLE:
-			return createRectangle();
-		case DGPackage.ROOT_CANVAS:
-			return createRootCanvas();
-		case DGPackage.ROTATE:
-			return createRotate();
-		case DGPackage.SCALE:
-			return createScale();
-		case DGPackage.SKEW:
-			return createSkew();
-		case DGPackage.TEXT:
-			return createText();
-		case DGPackage.TRANSLATE:
-			return createTranslate();
-		case DGPackage.USE:
-			return createUse();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName()
-					+ "' is not a valid classifier");
+			case DGPackage.CANVAS: return createCanvas();
+			case DGPackage.GROUP: return createGroup();
+			case DGPackage.MOVE_TO: return createMoveTo();
+			case DGPackage.CLIP_PATH: return createClipPath();
+			case DGPackage.STYLE: return createStyle();
+			case DGPackage.PAINT: return createPaint();
+			case DGPackage.CIRCLE: return createCircle();
+			case DGPackage.CLOSE_PATH: return createClosePath();
+			case DGPackage.CUBIC_CURVE_TO: return createCubicCurveTo();
+			case DGPackage.DEFINITIONS: return createDefinitions();
+			case DGPackage.STYLE_SHEET: return createStyleSheet();
+			case DGPackage.STYLE_RULE: return createStyleRule();
+			case DGPackage.STYLE_SELECTOR: return createStyleSelector();
+			case DGPackage.ELLIPSE: return createEllipse();
+			case DGPackage.ELLIPTICAL_ARC_TO: return createEllipticalArcTo();
+			case DGPackage.QUADRATIC_CURVE_TO: return createQuadraticCurveTo();
+			case DGPackage.GRADIENT_STOP: return createGradientStop();
+			case DGPackage.IMAGE: return createImage();
+			case DGPackage.LINE: return createLine();
+			case DGPackage.MARKER: return createMarker();
+			case DGPackage.LINEAR_GRADIENT: return createLinearGradient();
+			case DGPackage.LINE_TO: return createLineTo();
+			case DGPackage.MATRIX: return createMatrix();
+			case DGPackage.PATH: return createPath();
+			case DGPackage.PATTERN: return createPattern();
+			case DGPackage.POLYGON: return createPolygon();
+			case DGPackage.POLYLINE: return createPolyline();
+			case DGPackage.RADIAL_GRADIENT: return createRadialGradient();
+			case DGPackage.RECTANGLE: return createRectangle();
+			case DGPackage.ROOT_CANVAS: return createRootCanvas();
+			case DGPackage.ROTATE: return createRotate();
+			case DGPackage.SCALE: return createScale();
+			case DGPackage.SKEW: return createSkew();
+			case DGPackage.TEXT: return createText();
+			case DGPackage.TRANSLATE: return createTranslate();
+			case DGPackage.USE: return createUse();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
 		switch (eDataType.getClassifierID()) {
-		case DGPackage.FONT_DECORATION:
-			return createFontDecorationFromString(eDataType, initialValue);
-		case DGPackage.ELEMENT_KIND:
-			return createElementKindFromString(eDataType, initialValue);
-		default:
-			throw new IllegalArgumentException("The datatype '"
-					+ eDataType.getName() + "' is not a valid classifier");
+			case DGPackage.FONT_DECORATION:
+				return createFontDecorationFromString(eDataType, initialValue);
+			case DGPackage.ELEMENT_KIND:
+				return createElementKindFromString(eDataType, initialValue);
+			case DGPackage.TEXT_ANCHOR:
+				return createTextAnchorFromString(eDataType, initialValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
 		switch (eDataType.getClassifierID()) {
-		case DGPackage.FONT_DECORATION:
-			return convertFontDecorationToString(eDataType, instanceValue);
-		case DGPackage.ELEMENT_KIND:
-			return convertElementKindToString(eDataType, instanceValue);
-		default:
-			throw new IllegalArgumentException("The datatype '"
-					+ eDataType.getName() + "' is not a valid classifier");
+			case DGPackage.FONT_DECORATION:
+				return convertFontDecorationToString(eDataType, instanceValue);
+			case DGPackage.ELEMENT_KIND:
+				return convertElementKindToString(eDataType, instanceValue);
+			case DGPackage.TEXT_ANCHOR:
+				return convertTextAnchorToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Canvas createCanvas() {
@@ -192,7 +152,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Group createGroup() {
@@ -202,7 +161,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public MoveTo createMoveTo() {
@@ -212,7 +170,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public ClipPath createClipPath() {
@@ -222,7 +179,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Style createStyle() {
@@ -232,7 +188,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Paint createPaint() {
@@ -242,7 +197,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Circle createCircle() {
@@ -252,7 +206,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public ClosePath createClosePath() {
@@ -262,7 +215,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public CubicCurveTo createCubicCurveTo() {
@@ -272,7 +224,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Definitions createDefinitions() {
@@ -282,7 +233,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public StyleSheet createStyleSheet() {
@@ -292,7 +242,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public StyleRule createStyleRule() {
@@ -302,7 +251,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public StyleSelector createStyleSelector() {
@@ -312,7 +260,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Ellipse createEllipse() {
@@ -322,7 +269,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EllipticalArcTo createEllipticalArcTo() {
@@ -332,7 +278,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public QuadraticCurveTo createQuadraticCurveTo() {
@@ -342,7 +287,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public GradientStop createGradientStop() {
@@ -352,7 +296,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Image createImage() {
@@ -362,7 +305,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Line createLine() {
@@ -372,7 +314,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Marker createMarker() {
@@ -382,7 +323,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public LinearGradient createLinearGradient() {
@@ -392,7 +332,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public LineTo createLineTo() {
@@ -402,7 +341,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Matrix createMatrix() {
@@ -412,7 +350,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Path createPath() {
@@ -422,7 +359,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Pattern createPattern() {
@@ -432,7 +368,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Polygon createPolygon() {
@@ -442,7 +377,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Polyline createPolyline() {
@@ -452,7 +386,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public RadialGradient createRadialGradient() {
@@ -462,7 +395,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Rectangle createRectangle() {
@@ -472,7 +404,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public RootCanvas createRootCanvas() {
@@ -482,7 +413,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Rotate createRotate() {
@@ -492,7 +422,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Scale createScale() {
@@ -502,7 +431,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Skew createSkew() {
@@ -512,7 +440,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Text createText() {
@@ -522,7 +449,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Translate createTranslate() {
@@ -532,7 +458,6 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Use createUse() {
@@ -542,22 +467,17 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public FontDecoration createFontDecorationFromString(EDataType eDataType,
 			String initialValue) {
 		FontDecoration result = FontDecoration.get(initialValue);
-		if (result == null)
-			throw new IllegalArgumentException("The value '" + initialValue
-					+ "' is not a valid enumerator of '" + eDataType.getName()
-					+ "'");
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String convertFontDecorationToString(EDataType eDataType,
@@ -567,22 +487,17 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public ElementKind createElementKindFromString(EDataType eDataType,
 			String initialValue) {
 		ElementKind result = ElementKind.get(initialValue);
-		if (result == null)
-			throw new IllegalArgumentException("The value '" + initialValue
-					+ "' is not a valid enumerator of '" + eDataType.getName()
-					+ "'");
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String convertElementKindToString(EDataType eDataType,
@@ -591,17 +506,35 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TextAnchor createTextAnchorFromString(EDataType eDataType, String initialValue) {
+		TextAnchor result = TextAnchor.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertTextAnchorToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DGPackage getDGPackage() {
-		return (DGPackage) getEPackage();
+		return (DGPackage)getEPackage();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @deprecated
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java
index 2cdb70e594e..5fb7e8090a1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java
@@ -65,6 +65,7 @@ import org.eclipse.papyrus.dd.dg.StyleRule;
 import org.eclipse.papyrus.dd.dg.StyleSelector;
 import org.eclipse.papyrus.dd.dg.StyleSheet;
 import org.eclipse.papyrus.dd.dg.Text;
+import org.eclipse.papyrus.dd.dg.TextAnchor;
 import org.eclipse.papyrus.dd.dg.Transform;
 import org.eclipse.papyrus.dd.dg.Translate;
 import org.eclipse.papyrus.dd.dg.Use;
@@ -73,326 +74,287 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
  * end-user-doc -->
- * 
  * @generated
  */
 public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass canvasEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass groupEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass graphicalElementEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass definitionEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass moveToEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass pathCommandEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass clipPathEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass styleEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass paintEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass paintServerEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass transformEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass circleEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass closePathEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass cubicCurveToEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass definitionsEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass styleSheetEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass styleRuleEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass styleSelectorEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass ellipseEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass ellipticalArcToEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass quadraticCurveToEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass gradientEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass gradientStopEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass imageEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass lineEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass markedElementEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass markerEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass linearGradientEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass lineToEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass matrixEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass pathEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass patternEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass polygonEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass polylineEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass radialGradientEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass rectangleEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass rootCanvasEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass rotateEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass scaleEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass skewEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass textEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass translateEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass useEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EEnum fontDecorationEEnum = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EEnum elementKindEEnum = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum textAnchorEEnum = null;
+
+	/**
 	 * Creates an instance of the model <b>Package</b>, registered with
 	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
 	 * package package URI value.
@@ -413,7 +375,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -434,14 +395,10 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 * @generated
 	 */
 	public static DGPackage init() {
-		if (isInited)
-			return (DGPackage) EPackage.Registry.INSTANCE
-					.getEPackage(DGPackage.eNS_URI);
+		if (isInited) return (DGPackage)EPackage.Registry.INSTANCE.getEPackage(DGPackage.eNS_URI);
 
 		// Obtain or create and register package
-		DGPackageImpl theDGPackage = (DGPackageImpl) (EPackage.Registry.INSTANCE
-				.get(eNS_URI) instanceof DGPackageImpl ? EPackage.Registry.INSTANCE
-				.get(eNS_URI) : new DGPackageImpl());
+		DGPackageImpl theDGPackage = (DGPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DGPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DGPackageImpl());
 
 		isInited = true;
 
@@ -455,16 +412,18 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		theDGPackage.initializePackageContents();
 
 		// Register package validator
-		EValidator.Registry.INSTANCE.put(theDGPackage,
-				new EValidator.Descriptor() {
-					public EValidator getEValidator() {
-						return DGValidator.INSTANCE;
-					}
-				});
+		EValidator.Registry.INSTANCE.put
+			(theDGPackage, 
+			 new EValidator.Descriptor() {
+				 public EValidator getEValidator() {
+					 return DGValidator.INSTANCE;
+				 }
+			 });
 
 		// Mark meta-data to indicate it can't be changed
 		theDGPackage.freeze();
 
+  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(DGPackage.eNS_URI, theDGPackage);
 		return theDGPackage;
@@ -472,7 +431,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getCanvas() {
@@ -481,16 +439,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getCanvas_Bounds() {
-		return (EReference) canvasEClass.getEStructuralFeatures().get(0);
+		return (EReference)canvasEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map() {
@@ -499,7 +455,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getGroup() {
@@ -508,16 +463,23 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getGroup_Member() {
-		return (EReference) groupEClass.getEStructuralFeatures().get(0);
+		return (EReference)groupEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getGroup_Layout() {
+		return (EAttribute)groupEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getGraphicalElement() {
@@ -526,57 +488,55 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getGraphicalElement_ClipPath() {
-		return (EReference) graphicalElementEClass.getEStructuralFeatures()
-				.get(0);
+		return (EReference)graphicalElementEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getGraphicalElement_Group() {
-		return (EReference) graphicalElementEClass.getEStructuralFeatures()
-				.get(1);
+		return (EReference)graphicalElementEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getGraphicalElement_Class() {
-		return (EAttribute) graphicalElementEClass.getEStructuralFeatures()
-				.get(2);
+		return (EAttribute)graphicalElementEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getGraphicalElement_Style() {
-		return (EReference) graphicalElementEClass.getEStructuralFeatures()
-				.get(3);
+		return (EReference)graphicalElementEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getGraphicalElement_Transform() {
-		return (EReference) graphicalElementEClass.getEStructuralFeatures()
-				.get(4);
+		return (EReference)graphicalElementEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getGraphicalElement_LayoutData() {
+		return (EAttribute)graphicalElementEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map() {
@@ -585,7 +545,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getDefinition() {
@@ -594,16 +553,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getDefinition_Id() {
-		return (EAttribute) definitionEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)definitionEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getDefinition__IdCannotBeEmpty__DiagnosticChain_Map() {
@@ -612,7 +569,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getMoveTo() {
@@ -621,16 +577,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getMoveTo_Point() {
-		return (EReference) moveToEClass.getEStructuralFeatures().get(0);
+		return (EReference)moveToEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getPathCommand() {
@@ -639,16 +593,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getPathCommand_IsRelative() {
-		return (EAttribute) pathCommandEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)pathCommandEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getClipPath() {
@@ -657,7 +609,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getStyle() {
@@ -666,106 +617,94 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getStyle_Fill() {
-		return (EReference) styleEClass.getEStructuralFeatures().get(0);
+		return (EReference)styleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_FillOpacity() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getStyle_Stroke() {
-		return (EReference) styleEClass.getEStructuralFeatures().get(2);
+		return (EReference)styleEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_StrokeWidth() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(3);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_StrokeOpacity() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(4);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_StrokeDashLength() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(5);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_FontSize() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(6);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_FontName() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(7);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(7);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_FontItalic() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(8);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(8);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_FontBold() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(9);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(9);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_FontDecoration() {
-		return (EAttribute) styleEClass.getEStructuralFeatures().get(10);
+		return (EAttribute)styleEClass.getEStructuralFeatures().get(10);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getStyle__ValidFontSize__DiagnosticChain_Map() {
@@ -774,7 +713,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getStyle__ValidFillOpacity__DiagnosticChain_Map() {
@@ -783,7 +721,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getStyle__ValidStrokeWidth__DiagnosticChain_Map() {
@@ -792,7 +729,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getStyle__ValidDashLengthSize__DiagnosticChain_Map() {
@@ -801,7 +737,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getStyle__ValidStrokeOpacity__DiagnosticChain_Map() {
@@ -810,7 +745,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getPaint() {
@@ -819,25 +753,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getPaint_Color() {
-		return (EAttribute) paintEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)paintEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getPaint_PaintServer() {
-		return (EReference) paintEClass.getEStructuralFeatures().get(1);
+		return (EReference)paintEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map() {
@@ -846,7 +777,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getPaintServer() {
@@ -855,16 +785,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getPaintServer_Transform() {
-		return (EReference) paintServerEClass.getEStructuralFeatures().get(0);
+		return (EReference)paintServerEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getTransform() {
@@ -873,7 +801,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getCircle() {
@@ -882,25 +809,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getCircle_Center() {
-		return (EReference) circleEClass.getEStructuralFeatures().get(0);
+		return (EReference)circleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getCircle_Radius() {
-		return (EAttribute) circleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)circleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getCircle__NonNegativeRadius__DiagnosticChain_Map() {
@@ -909,7 +833,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getClosePath() {
@@ -918,7 +841,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getCubicCurveTo() {
@@ -927,34 +849,30 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getCubicCurveTo_Point() {
-		return (EReference) cubicCurveToEClass.getEStructuralFeatures().get(2);
+		return (EReference)cubicCurveToEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getCubicCurveTo_StartControl() {
-		return (EReference) cubicCurveToEClass.getEStructuralFeatures().get(0);
+		return (EReference)cubicCurveToEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getCubicCurveTo_EndControl() {
-		return (EReference) cubicCurveToEClass.getEStructuralFeatures().get(1);
+		return (EReference)cubicCurveToEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getDefinitions() {
@@ -963,25 +881,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getDefinitions_Defnition() {
-		return (EReference) definitionsEClass.getEStructuralFeatures().get(0);
+		return (EReference)definitionsEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getDefinitions_StyleSheet() {
-		return (EReference) definitionsEClass.getEStructuralFeatures().get(1);
+		return (EReference)definitionsEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getStyleSheet() {
@@ -990,16 +905,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getStyleSheet_Rule() {
-		return (EReference) styleSheetEClass.getEStructuralFeatures().get(0);
+		return (EReference)styleSheetEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getStyleRule() {
@@ -1008,25 +921,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getStyleRule_Selector() {
-		return (EReference) styleRuleEClass.getEStructuralFeatures().get(0);
+		return (EReference)styleRuleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getStyleRule_Style() {
-		return (EReference) styleRuleEClass.getEStructuralFeatures().get(1);
+		return (EReference)styleRuleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getStyleSelector() {
@@ -1035,25 +945,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getStyleSelector_Kind() {
-		return (EAttribute) styleSelectorEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)styleSelectorEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getStyleSelector_Class() {
-		return (EAttribute) styleSelectorEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)styleSelectorEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getEllipse() {
@@ -1062,25 +969,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getEllipse_Center() {
-		return (EReference) ellipseEClass.getEStructuralFeatures().get(0);
+		return (EReference)ellipseEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getEllipse_Radii() {
-		return (EReference) ellipseEClass.getEStructuralFeatures().get(1);
+		return (EReference)ellipseEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getEllipticalArcTo() {
@@ -1089,57 +993,46 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getEllipticalArcTo_Point() {
-		return (EReference) ellipticalArcToEClass.getEStructuralFeatures().get(
-				4);
+		return (EReference)ellipticalArcToEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getEllipticalArcTo_Radii() {
-		return (EReference) ellipticalArcToEClass.getEStructuralFeatures().get(
-				0);
+		return (EReference)ellipticalArcToEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getEllipticalArcTo_Rotation() {
-		return (EAttribute) ellipticalArcToEClass.getEStructuralFeatures().get(
-				1);
+		return (EAttribute)ellipticalArcToEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getEllipticalArcTo_IsLargeArc() {
-		return (EAttribute) ellipticalArcToEClass.getEStructuralFeatures().get(
-				2);
+		return (EAttribute)ellipticalArcToEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getEllipticalArcTo_IsSweep() {
-		return (EAttribute) ellipticalArcToEClass.getEStructuralFeatures().get(
-				3);
+		return (EAttribute)ellipticalArcToEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getQuadraticCurveTo() {
@@ -1148,27 +1041,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getQuadraticCurveTo_Point() {
-		return (EReference) quadraticCurveToEClass.getEStructuralFeatures()
-				.get(1);
+		return (EReference)quadraticCurveToEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getQuadraticCurveTo_Control() {
-		return (EReference) quadraticCurveToEClass.getEStructuralFeatures()
-				.get(0);
+		return (EReference)quadraticCurveToEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getGradient() {
@@ -1177,16 +1065,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getGradient_Stop() {
-		return (EReference) gradientEClass.getEStructuralFeatures().get(0);
+		return (EReference)gradientEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getGradientStop() {
@@ -1195,34 +1081,30 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getGradientStop_Color() {
-		return (EAttribute) gradientStopEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)gradientStopEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getGradientStop_Offset() {
-		return (EAttribute) gradientStopEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)gradientStopEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getGradientStop_Opacity() {
-		return (EAttribute) gradientStopEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)gradientStopEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getGradientStop__ValidOffset__DiagnosticChain_Map() {
@@ -1231,7 +1113,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getGradientStop__ValidOpacity__DiagnosticChain_Map() {
@@ -1240,7 +1121,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getImage() {
@@ -1249,34 +1129,30 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getImage_Source() {
-		return (EAttribute) imageEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)imageEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getImage_Bounds() {
-		return (EReference) imageEClass.getEStructuralFeatures().get(1);
+		return (EReference)imageEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getImage_IsAspectRatioPreserved() {
-		return (EAttribute) imageEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)imageEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getImage__SourceCannotBeEmpty__DiagnosticChain_Map() {
@@ -1285,7 +1161,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getLine() {
@@ -1294,25 +1169,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getLine_Start() {
-		return (EReference) lineEClass.getEStructuralFeatures().get(0);
+		return (EReference)lineEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getLine_End() {
-		return (EReference) lineEClass.getEStructuralFeatures().get(1);
+		return (EReference)lineEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getMarkedElement() {
@@ -1321,34 +1193,30 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getMarkedElement_EndMarker() {
-		return (EReference) markedElementEClass.getEStructuralFeatures().get(0);
+		return (EReference)markedElementEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getMarkedElement_MidMarker() {
-		return (EReference) markedElementEClass.getEStructuralFeatures().get(1);
+		return (EReference)markedElementEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getMarkedElement_StartMarker() {
-		return (EReference) markedElementEClass.getEStructuralFeatures().get(2);
+		return (EReference)markedElementEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map() {
@@ -1357,7 +1225,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map() {
@@ -1366,7 +1233,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map() {
@@ -1375,7 +1241,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getMarker() {
@@ -1384,25 +1249,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getMarker_Size() {
-		return (EReference) markerEClass.getEStructuralFeatures().get(0);
+		return (EReference)markerEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getMarker_Reference() {
-		return (EReference) markerEClass.getEStructuralFeatures().get(1);
+		return (EReference)markerEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getLinearGradient() {
@@ -1411,27 +1273,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getLinearGradient_Start() {
-		return (EReference) linearGradientEClass.getEStructuralFeatures()
-				.get(0);
+		return (EReference)linearGradientEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getLinearGradient_End() {
-		return (EReference) linearGradientEClass.getEStructuralFeatures()
-				.get(1);
+		return (EReference)linearGradientEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getLinearGradient__ValidGradientVector__DiagnosticChain_Map() {
@@ -1440,7 +1297,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getLineTo() {
@@ -1449,16 +1305,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getLineTo_Point() {
-		return (EReference) lineToEClass.getEStructuralFeatures().get(0);
+		return (EReference)lineToEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getMatrix() {
@@ -1467,61 +1321,54 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getMatrix_A() {
-		return (EAttribute) matrixEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)matrixEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getMatrix_B() {
-		return (EAttribute) matrixEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)matrixEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getMatrix_C() {
-		return (EAttribute) matrixEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)matrixEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getMatrix_D() {
-		return (EAttribute) matrixEClass.getEStructuralFeatures().get(3);
+		return (EAttribute)matrixEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getMatrix_E() {
-		return (EAttribute) matrixEClass.getEStructuralFeatures().get(4);
+		return (EAttribute)matrixEClass.getEStructuralFeatures().get(4);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getMatrix_F() {
-		return (EAttribute) matrixEClass.getEStructuralFeatures().get(5);
+		return (EAttribute)matrixEClass.getEStructuralFeatures().get(5);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getPath() {
@@ -1530,16 +1377,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getPath_Command() {
-		return (EReference) pathEClass.getEStructuralFeatures().get(0);
+		return (EReference)pathEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getPath__FirstCommandMustBeMove__DiagnosticChain_Map() {
@@ -1548,7 +1393,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getPattern() {
@@ -1557,25 +1401,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getPattern_Bounds() {
-		return (EReference) patternEClass.getEStructuralFeatures().get(0);
+		return (EReference)patternEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getPattern_Tile() {
-		return (EReference) patternEClass.getEStructuralFeatures().get(1);
+		return (EReference)patternEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getPolygon() {
@@ -1584,16 +1425,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getPolygon_Point() {
-		return (EReference) polygonEClass.getEStructuralFeatures().get(0);
+		return (EReference)polygonEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getPolyline() {
@@ -1602,16 +1441,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getPolyline_Point() {
-		return (EReference) polylineEClass.getEStructuralFeatures().get(0);
+		return (EReference)polylineEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getRadialGradient() {
@@ -1620,37 +1457,30 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getRadialGradient_Center() {
-		return (EReference) radialGradientEClass.getEStructuralFeatures()
-				.get(0);
+		return (EReference)radialGradientEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getRadialGradient_Focus() {
-		return (EReference) radialGradientEClass.getEStructuralFeatures()
-				.get(1);
+		return (EReference)radialGradientEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getRadialGradient_Radius() {
-		return (EAttribute) radialGradientEClass.getEStructuralFeatures()
-				.get(2);
+		return (EAttribute)radialGradientEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getRadialGradient__ValidCenterPoint__DiagnosticChain_Map() {
@@ -1659,7 +1489,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getRadialGradient__ValidFocusPoint__DiagnosticChain_Map() {
@@ -1668,7 +1497,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getRadialGradient__ValidRadius__DiagnosticChain_Map() {
@@ -1677,7 +1505,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getRectangle() {
@@ -1686,25 +1513,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getRectangle_Bounds() {
-		return (EReference) rectangleEClass.getEStructuralFeatures().get(0);
+		return (EReference)rectangleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getRectangle_CornerRadius() {
-		return (EAttribute) rectangleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)rectangleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map() {
@@ -1713,7 +1537,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getRootCanvas() {
@@ -1722,34 +1545,39 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getRootCanvas_BackgroundColor() {
-		return (EAttribute) rootCanvasEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)rootCanvasEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getRootCanvas_Definitions() {
-		return (EReference) rootCanvasEClass.getEStructuralFeatures().get(1);
+		return (EReference)rootCanvasEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getRootCanvas_ExternalStyleSheet() {
-		return (EReference) rootCanvasEClass.getEStructuralFeatures().get(2);
+		return (EReference)rootCanvasEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getRootCanvas_Script() {
+		return (EAttribute)rootCanvasEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getRotate() {
@@ -1758,25 +1586,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getRotate_Angle() {
-		return (EAttribute) rotateEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)rotateEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getRotate_Center() {
-		return (EReference) rotateEClass.getEStructuralFeatures().get(1);
+		return (EReference)rotateEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getScale() {
@@ -1785,25 +1610,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getScale_FactorX() {
-		return (EAttribute) scaleEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)scaleEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getScale_FactorY() {
-		return (EAttribute) scaleEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)scaleEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getScale__Nonnegativescale__DiagnosticChain_Map() {
@@ -1812,7 +1634,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getSkew() {
@@ -1821,25 +1642,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getSkew_AngleX() {
-		return (EAttribute) skewEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)skewEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getSkew_AngleY() {
-		return (EAttribute) skewEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)skewEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getText() {
@@ -1848,25 +1666,31 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getText_Data() {
-		return (EAttribute) textEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)textEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getText_Position() {
-		return (EReference) textEClass.getEStructuralFeatures().get(1);
+		return (EReference)textEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getText_Anchor() {
+		return (EAttribute)textEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getText__DataCannotBeEmpty__DiagnosticChain_Map() {
@@ -1875,7 +1699,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getTranslate() {
@@ -1884,25 +1707,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getTranslate_DeltaX() {
-		return (EAttribute) translateEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)translateEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getTranslate_DeltaY() {
-		return (EAttribute) translateEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)translateEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getUse() {
@@ -1911,25 +1731,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getUse_Bounds() {
-		return (EReference) useEClass.getEStructuralFeatures().get(0);
+		return (EReference)useEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getUse_ReferencedElement() {
-		return (EReference) useEClass.getEStructuralFeatures().get(1);
+		return (EReference)useEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EOperation getUse__ReferencedElementHasId__DiagnosticChain_Map() {
@@ -1938,7 +1755,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EEnum getFontDecoration() {
@@ -1947,7 +1763,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EEnum getElementKind() {
@@ -1955,41 +1770,47 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EEnum getTextAnchor() {
+		return textAnchorEEnum;
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DGFactory getDGFactory() {
-		return (DGFactory) getEFactoryInstance();
+		return (DGFactory)getEFactoryInstance();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package. This method is guarded to
-	 * have no affect on any invocation but its first. <!-- begin-user-doc -->
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated)
-			return;
+		if (isCreated) return;
 		isCreated = true;
 
 		// Create classes and their features
 		canvasEClass = createEClass(CANVAS);
 		createEReference(canvasEClass, CANVAS__BOUNDS);
-		createEOperation(canvasEClass,
-				CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP);
+		createEOperation(canvasEClass, CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP);
 
 		groupEClass = createEClass(GROUP);
 		createEReference(groupEClass, GROUP__MEMBER);
+		createEAttribute(groupEClass, GROUP__LAYOUT);
 
 		graphicalElementEClass = createEClass(GRAPHICAL_ELEMENT);
 		createEReference(graphicalElementEClass, GRAPHICAL_ELEMENT__CLIP_PATH);
@@ -1997,13 +1818,12 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		createEAttribute(graphicalElementEClass, GRAPHICAL_ELEMENT__CLASS);
 		createEReference(graphicalElementEClass, GRAPHICAL_ELEMENT__STYLE);
 		createEReference(graphicalElementEClass, GRAPHICAL_ELEMENT__TRANSFORM);
-		createEOperation(graphicalElementEClass,
-				GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP);
+		createEAttribute(graphicalElementEClass, GRAPHICAL_ELEMENT__LAYOUT_DATA);
+		createEOperation(graphicalElementEClass, GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP);
 
 		definitionEClass = createEClass(DEFINITION);
 		createEAttribute(definitionEClass, DEFINITION__ID);
-		createEOperation(definitionEClass,
-				DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP);
+		createEOperation(definitionEClass, DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP);
 
 		moveToEClass = createEClass(MOVE_TO);
 		createEReference(moveToEClass, MOVE_TO__POINT);
@@ -2025,22 +1845,16 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		createEAttribute(styleEClass, STYLE__FONT_ITALIC);
 		createEAttribute(styleEClass, STYLE__FONT_BOLD);
 		createEAttribute(styleEClass, STYLE__FONT_DECORATION);
-		createEOperation(styleEClass,
-				STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP);
-		createEOperation(styleEClass,
-				STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP);
-		createEOperation(styleEClass,
-				STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP);
-		createEOperation(styleEClass,
-				STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP);
-		createEOperation(styleEClass,
-				STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP);
+		createEOperation(styleEClass, STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP);
+		createEOperation(styleEClass, STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP);
+		createEOperation(styleEClass, STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP);
+		createEOperation(styleEClass, STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP);
+		createEOperation(styleEClass, STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP);
 
 		paintEClass = createEClass(PAINT);
 		createEAttribute(paintEClass, PAINT__COLOR);
 		createEReference(paintEClass, PAINT__PAINT_SERVER);
-		createEOperation(paintEClass,
-				PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP);
+		createEOperation(paintEClass, PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP);
 
 		paintServerEClass = createEClass(PAINT_SERVER);
 		createEReference(paintServerEClass, PAINT_SERVER__TRANSFORM);
@@ -2050,8 +1864,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		circleEClass = createEClass(CIRCLE);
 		createEReference(circleEClass, CIRCLE__CENTER);
 		createEAttribute(circleEClass, CIRCLE__RADIUS);
-		createEOperation(circleEClass,
-				CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP);
+		createEOperation(circleEClass, CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP);
 
 		closePathEClass = createEClass(CLOSE_PATH);
 
@@ -2097,17 +1910,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		createEAttribute(gradientStopEClass, GRADIENT_STOP__COLOR);
 		createEAttribute(gradientStopEClass, GRADIENT_STOP__OFFSET);
 		createEAttribute(gradientStopEClass, GRADIENT_STOP__OPACITY);
-		createEOperation(gradientStopEClass,
-				GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP);
-		createEOperation(gradientStopEClass,
-				GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP);
+		createEOperation(gradientStopEClass, GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP);
+		createEOperation(gradientStopEClass, GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP);
 
 		imageEClass = createEClass(IMAGE);
 		createEAttribute(imageEClass, IMAGE__SOURCE);
 		createEReference(imageEClass, IMAGE__BOUNDS);
 		createEAttribute(imageEClass, IMAGE__IS_ASPECT_RATIO_PRESERVED);
-		createEOperation(imageEClass,
-				IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP);
+		createEOperation(imageEClass, IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP);
 
 		lineEClass = createEClass(LINE);
 		createEReference(lineEClass, LINE__START);
@@ -2117,12 +1927,9 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		createEReference(markedElementEClass, MARKED_ELEMENT__END_MARKER);
 		createEReference(markedElementEClass, MARKED_ELEMENT__MID_MARKER);
 		createEReference(markedElementEClass, MARKED_ELEMENT__START_MARKER);
-		createEOperation(markedElementEClass,
-				MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP);
-		createEOperation(markedElementEClass,
-				MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP);
-		createEOperation(markedElementEClass,
-				MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP);
+		createEOperation(markedElementEClass, MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP);
+		createEOperation(markedElementEClass, MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP);
+		createEOperation(markedElementEClass, MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP);
 
 		markerEClass = createEClass(MARKER);
 		createEReference(markerEClass, MARKER__SIZE);
@@ -2131,8 +1938,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		linearGradientEClass = createEClass(LINEAR_GRADIENT);
 		createEReference(linearGradientEClass, LINEAR_GRADIENT__START);
 		createEReference(linearGradientEClass, LINEAR_GRADIENT__END);
-		createEOperation(linearGradientEClass,
-				LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP);
+		createEOperation(linearGradientEClass, LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP);
 
 		lineToEClass = createEClass(LINE_TO);
 		createEReference(lineToEClass, LINE_TO__POINT);
@@ -2147,8 +1953,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 		pathEClass = createEClass(PATH);
 		createEReference(pathEClass, PATH__COMMAND);
-		createEOperation(pathEClass,
-				PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP);
+		createEOperation(pathEClass, PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP);
 
 		patternEClass = createEClass(PATTERN);
 		createEReference(patternEClass, PATTERN__BOUNDS);
@@ -2164,23 +1969,20 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		createEReference(radialGradientEClass, RADIAL_GRADIENT__CENTER);
 		createEReference(radialGradientEClass, RADIAL_GRADIENT__FOCUS);
 		createEAttribute(radialGradientEClass, RADIAL_GRADIENT__RADIUS);
-		createEOperation(radialGradientEClass,
-				RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP);
-		createEOperation(radialGradientEClass,
-				RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP);
-		createEOperation(radialGradientEClass,
-				RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP);
+		createEOperation(radialGradientEClass, RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP);
+		createEOperation(radialGradientEClass, RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP);
+		createEOperation(radialGradientEClass, RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP);
 
 		rectangleEClass = createEClass(RECTANGLE);
 		createEReference(rectangleEClass, RECTANGLE__BOUNDS);
 		createEAttribute(rectangleEClass, RECTANGLE__CORNER_RADIUS);
-		createEOperation(rectangleEClass,
-				RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP);
+		createEOperation(rectangleEClass, RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP);
 
 		rootCanvasEClass = createEClass(ROOT_CANVAS);
 		createEAttribute(rootCanvasEClass, ROOT_CANVAS__BACKGROUND_COLOR);
 		createEReference(rootCanvasEClass, ROOT_CANVAS__DEFINITIONS);
 		createEReference(rootCanvasEClass, ROOT_CANVAS__EXTERNAL_STYLE_SHEET);
+		createEAttribute(rootCanvasEClass, ROOT_CANVAS__SCRIPT);
 
 		rotateEClass = createEClass(ROTATE);
 		createEAttribute(rotateEClass, ROTATE__ANGLE);
@@ -2189,8 +1991,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		scaleEClass = createEClass(SCALE);
 		createEAttribute(scaleEClass, SCALE__FACTOR_X);
 		createEAttribute(scaleEClass, SCALE__FACTOR_Y);
-		createEOperation(scaleEClass,
-				SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP);
+		createEOperation(scaleEClass, SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP);
 
 		skewEClass = createEClass(SKEW);
 		createEAttribute(skewEClass, SKEW__ANGLE_X);
@@ -2199,8 +2000,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		textEClass = createEClass(TEXT);
 		createEAttribute(textEClass, TEXT__DATA);
 		createEReference(textEClass, TEXT__POSITION);
-		createEOperation(textEClass,
-				TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP);
+		createEAttribute(textEClass, TEXT__ANCHOR);
+		createEOperation(textEClass, TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP);
 
 		translateEClass = createEClass(TRANSLATE);
 		createEAttribute(translateEClass, TRANSLATE__DELTA_X);
@@ -2209,17 +2010,16 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		useEClass = createEClass(USE);
 		createEReference(useEClass, USE__BOUNDS);
 		createEReference(useEClass, USE__REFERENCED_ELEMENT);
-		createEOperation(useEClass,
-				USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP);
+		createEOperation(useEClass, USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP);
 
 		// Create enums
 		fontDecorationEEnum = createEEnum(FONT_DECORATION);
 		elementKindEEnum = createEEnum(ELEMENT_KIND);
+		textAnchorEEnum = createEEnum(TEXT_ANCHOR);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -2232,8 +2032,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized)
-			return;
+		if (isInitialized) return;
 		isInitialized = true;
 
 		// Initialize package
@@ -2242,8 +2041,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		DCPackage theDCPackage = (DCPackage) EPackage.Registry.INSTANCE
-				.getEPackage(DCPackage.eNS_URI);
+		DCPackage theDCPackage = (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -2285,19 +2083,11 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		useEClass.getESuperTypes().add(this.getGraphicalElement());
 
 		// Initialize classes, features, and operations; add parameters
-		initEClass(canvasEClass, Canvas.class, "Canvas", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCanvas_Bounds(), theDCPackage.getBounds(), null,
-				"bounds", null, 0, 1, Canvas.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		EOperation op = initEOperation(
-				getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "canvasCannotHaveTransforms", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(canvasEClass, Canvas.class, "Canvas", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCanvas_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 0, 1, Canvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		EOperation op = initEOperation(getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "canvasCannotHaveTransforms", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		EGenericType g1 = createEGenericType(ecorePackage.getEMap());
 		EGenericType g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2305,47 +2095,20 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(groupEClass, Group.class, "Group", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getGroup_Member(), this.getGraphicalElement(),
-				this.getGraphicalElement_Group(), "member", null, 0, -1,
-				Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-
-		initEClass(graphicalElementEClass, GraphicalElement.class,
-				"GraphicalElement", IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getGraphicalElement_ClipPath(), this.getClipPath(),
-				null, "clipPath", null, 0, 1, GraphicalElement.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getGraphicalElement_Group(), this.getGroup(),
-				this.getGroup_Member(), "group", null, 0, 1,
-				GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getGraphicalElement_Class(), theDCPackage.getString(),
-				"class", null, 0, -1, GraphicalElement.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-		initEReference(getGraphicalElement_Style(), this.getStyle(), null,
-				"style", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getGraphicalElement_Transform(), this.getTransform(),
-				null, "transform", null, 0, -1, GraphicalElement.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-
-		op = initEOperation(
-				getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "referencedClippathHasId", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(groupEClass, Group.class, "Group", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getGroup_Member(), this.getGraphicalElement(), this.getGraphicalElement_Group(), "member", null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getGroup_Layout(), theDCPackage.getString(), "layout", null, 0, 1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(graphicalElementEClass, GraphicalElement.class, "GraphicalElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getGraphicalElement_ClipPath(), this.getClipPath(), null, "clipPath", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getGraphicalElement_Group(), this.getGroup(), this.getGroup_Member(), "group", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getGraphicalElement_Class(), theDCPackage.getString(), "class", null, 0, -1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getGraphicalElement_Style(), this.getStyle(), null, "style", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getGraphicalElement_Transform(), this.getTransform(), null, "transform", null, 0, -1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getGraphicalElement_LayoutData(), theDCPackage.getString(), "layoutData", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedClippathHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2353,19 +2116,11 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(definitionEClass, Definition.class, "Definition",
-				IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDefinition_Id(), theDCPackage.getString(), "id",
-				null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-
-		op = initEOperation(
-				getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "idCannotBeEmpty", 0, 1, IS_UNIQUE,
-				IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(definitionEClass, Definition.class, "Definition", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDefinition_Id(), theDCPackage.getString(), "id", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "idCannotBeEmpty", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2373,75 +2128,29 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(moveToEClass, MoveTo.class, "MoveTo", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMoveTo_Point(), theDCPackage.getPoint(), null,
-				"point", null, 1, 1, MoveTo.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(pathCommandEClass, PathCommand.class, "PathCommand",
-				IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPathCommand_IsRelative(), theDCPackage.getBoolean(),
-				"isRelative", "false", 1, 1, PathCommand.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-
-		initEClass(clipPathEClass, ClipPath.class, "ClipPath", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(styleEClass, Style.class, "Style", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getStyle_Fill(), this.getPaint(), null, "fill", null, 0,
-				1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getStyle_FillOpacity(), theDCPackage.getReal(),
-				"fillOpacity", null, 0, 1, Style.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEReference(getStyle_Stroke(), this.getPaint(), null, "stroke",
-				null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getStyle_StrokeWidth(), theDCPackage.getReal(),
-				"strokeWidth", null, 0, 1, Style.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getStyle_StrokeOpacity(), theDCPackage.getReal(),
-				"strokeOpacity", null, 0, 1, Style.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getStyle_StrokeDashLength(), theDCPackage.getReal(),
-				"strokeDashLength", null, 0, -1, Style.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getStyle_FontSize(), theDCPackage.getReal(), "fontSize",
-				null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEAttribute(getStyle_FontName(), theDCPackage.getString(),
-				"fontName", null, 0, 1, Style.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getStyle_FontItalic(), theDCPackage.getBoolean(),
-				"fontItalic", null, 0, 1, Style.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getStyle_FontBold(), theDCPackage.getBoolean(),
-				"fontBold", null, 0, 1, Style.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getStyle_FontDecoration(), this.getFontDecoration(),
-				"fontDecoration", null, 0, 1, Style.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-
-		op = initEOperation(getStyle__ValidFontSize__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "validFontSize", 0, 1, IS_UNIQUE,
-				IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(moveToEClass, MoveTo.class, "MoveTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getMoveTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, MoveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(pathCommandEClass, PathCommand.class, "PathCommand", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPathCommand_IsRelative(), theDCPackage.getBoolean(), "isRelative", "false", 1, 1, PathCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(clipPathEClass, ClipPath.class, "ClipPath", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(styleEClass, Style.class, "Style", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getStyle_Fill(), this.getPaint(), null, "fill", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getStyle_FillOpacity(), theDCPackage.getReal(), "fillOpacity", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getStyle_Stroke(), this.getPaint(), null, "stroke", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getStyle_StrokeWidth(), theDCPackage.getReal(), "strokeWidth", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getStyle_StrokeOpacity(), theDCPackage.getReal(), "strokeOpacity", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getStyle_StrokeDashLength(), theDCPackage.getReal(), "strokeDashLength", null, 0, -1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getStyle_FontSize(), theDCPackage.getReal(), "fontSize", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getStyle_FontName(), theDCPackage.getString(), "fontName", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getStyle_FontItalic(), theDCPackage.getBoolean(), "fontItalic", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getStyle_FontBold(), theDCPackage.getBoolean(), "fontBold", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getStyle_FontDecoration(), this.getFontDecoration(), "fontDecoration", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getStyle__ValidFontSize__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validFontSize", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2449,11 +2158,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		op = initEOperation(getStyle__ValidFillOpacity__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "validFillOpacity", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		op = initEOperation(getStyle__ValidFillOpacity__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validFillOpacity", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2461,11 +2167,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		op = initEOperation(getStyle__ValidStrokeWidth__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "validStrokeWidth", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		op = initEOperation(getStyle__ValidStrokeWidth__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validStrokeWidth", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2473,12 +2176,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		op = initEOperation(
-				getStyle__ValidDashLengthSize__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "validDashLengthSize", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		op = initEOperation(getStyle__ValidDashLengthSize__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validDashLengthSize", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2486,12 +2185,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		op = initEOperation(
-				getStyle__ValidStrokeOpacity__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "validStrokeOpacity", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		op = initEOperation(getStyle__ValidStrokeOpacity__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validStrokeOpacity", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2499,23 +2194,12 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(paintEClass, Paint.class, "Paint", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPaint_Color(), theDCPackage.getColor(), "color",
-				null, 0, 1, Paint.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getPaint_PaintServer(), this.getPaintServer(), null,
-				"paintServer", null, 0, 1, Paint.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		op = initEOperation(
-				getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "referencedPaintServerHasId", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(paintEClass, Paint.class, "Paint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getPaint_Color(), theDCPackage.getColor(), "color", null, 0, 1, Paint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getPaint_PaintServer(), this.getPaintServer(), null, "paintServer", null, 0, 1, Paint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedPaintServerHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2523,33 +2207,17 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(paintServerEClass, PaintServer.class, "PaintServer",
-				IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPaintServer_Transform(), this.getTransform(), null,
-				"transform", null, 0, -1, PaintServer.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(transformEClass, Transform.class, "Transform", IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(circleEClass, Circle.class, "Circle", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCircle_Center(), theDCPackage.getPoint(), null,
-				"center", null, 1, 1, Circle.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getCircle_Radius(), theDCPackage.getReal(), "radius",
-				"0", 1, 1, Circle.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-
-		op = initEOperation(
-				getCircle__NonNegativeRadius__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "nonNegativeRadius", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(paintServerEClass, PaintServer.class, "PaintServer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getPaintServer_Transform(), this.getTransform(), null, "transform", null, 0, -1, PaintServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(transformEClass, Transform.class, "Transform", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(circleEClass, Circle.class, "Circle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCircle_Center(), theDCPackage.getPoint(), null, "center", null, 1, 1, Circle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getCircle_Radius(), theDCPackage.getReal(), "radius", "0", 1, 1, Circle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getCircle__NonNegativeRadius__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeRadius", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2557,146 +2225,53 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(closePathEClass, ClosePath.class, "ClosePath", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(cubicCurveToEClass, CubicCurveTo.class, "CubicCurveTo",
-				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCubicCurveTo_StartControl(), theDCPackage.getPoint(),
-				null, "startControl", null, 1, 1, CubicCurveTo.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getCubicCurveTo_EndControl(), theDCPackage.getPoint(),
-				null, "endControl", null, 1, 1, CubicCurveTo.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getCubicCurveTo_Point(), theDCPackage.getPoint(), null,
-				"point", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(definitionsEClass, Definitions.class, "Definitions",
-				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDefinitions_Defnition(), this.getDefinition(), null,
-				"defnition", null, 0, -1, Definitions.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDefinitions_StyleSheet(), this.getStyleSheet(), null,
-				"styleSheet", null, 0, 1, Definitions.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(styleSheetEClass, StyleSheet.class, "StyleSheet",
-				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getStyleSheet_Rule(), this.getStyleRule(), null, "rule",
-				null, 0, -1, StyleSheet.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(styleRuleEClass, StyleRule.class, "StyleRule", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getStyleRule_Selector(), this.getStyleSelector(), null,
-				"selector", null, 1, -1, StyleRule.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getStyleRule_Style(), this.getStyle(), null, "style",
-				null, 1, 1, StyleRule.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(styleSelectorEClass, StyleSelector.class, "StyleSelector",
-				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getStyleSelector_Kind(), this.getElementKind(), "kind",
-				null, 0, 1, StyleSelector.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEAttribute(getStyleSelector_Class(), theDCPackage.getString(),
-				"class", null, 0, -1, StyleSelector.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-
-		initEClass(ellipseEClass, Ellipse.class, "Ellipse", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEllipse_Center(), theDCPackage.getPoint(), null,
-				"center", null, 1, 1, Ellipse.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getEllipse_Radii(), theDCPackage.getDimension(), null,
-				"radii", null, 1, 1, Ellipse.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(ellipticalArcToEClass, EllipticalArcTo.class,
-				"EllipticalArcTo", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEllipticalArcTo_Radii(), theDCPackage.getDimension(),
-				null, "radii", null, 1, 1, EllipticalArcTo.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEAttribute(getEllipticalArcTo_Rotation(), theDCPackage.getReal(),
-				"rotation", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getEllipticalArcTo_IsLargeArc(),
-				theDCPackage.getBoolean(), "isLargeArc", null, 1, 1,
-				EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEAttribute(getEllipticalArcTo_IsSweep(), theDCPackage.getBoolean(),
-				"isSweep", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEReference(getEllipticalArcTo_Point(), theDCPackage.getPoint(),
-				null, "point", null, 1, 1, EllipticalArcTo.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-
-		initEClass(quadraticCurveToEClass, QuadraticCurveTo.class,
-				"QuadraticCurveTo", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getQuadraticCurveTo_Control(), theDCPackage.getPoint(),
-				null, "control", null, 1, 1, QuadraticCurveTo.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getQuadraticCurveTo_Point(), theDCPackage.getPoint(),
-				null, "point", null, 1, 1, QuadraticCurveTo.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-
-		initEClass(gradientEClass, Gradient.class, "Gradient", IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getGradient_Stop(), this.getGradientStop(), null,
-				"stop", null, 2, -1, Gradient.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(gradientStopEClass, GradientStop.class, "GradientStop",
-				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getGradientStop_Color(), theDCPackage.getColor(),
-				"color", null, 0, 1, GradientStop.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getGradientStop_Offset(), theDCPackage.getReal(),
-				"offset", null, 0, 1, GradientStop.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getGradientStop_Opacity(), theDCPackage.getReal(),
-				"opacity", null, 0, 1, GradientStop.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-
-		op = initEOperation(
-				getGradientStop__ValidOffset__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "validOffset", 0, 1, IS_UNIQUE,
-				IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(closePathEClass, ClosePath.class, "ClosePath", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(cubicCurveToEClass, CubicCurveTo.class, "CubicCurveTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getCubicCurveTo_StartControl(), theDCPackage.getPoint(), null, "startControl", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getCubicCurveTo_EndControl(), theDCPackage.getPoint(), null, "endControl", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getCubicCurveTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(definitionsEClass, Definitions.class, "Definitions", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDefinitions_Defnition(), this.getDefinition(), null, "defnition", null, 0, -1, Definitions.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getDefinitions_StyleSheet(), this.getStyleSheet(), null, "styleSheet", null, 0, 1, Definitions.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(styleSheetEClass, StyleSheet.class, "StyleSheet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getStyleSheet_Rule(), this.getStyleRule(), null, "rule", null, 0, -1, StyleSheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(styleRuleEClass, StyleRule.class, "StyleRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getStyleRule_Selector(), this.getStyleSelector(), null, "selector", null, 1, -1, StyleRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getStyleRule_Style(), this.getStyle(), null, "style", null, 1, 1, StyleRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(styleSelectorEClass, StyleSelector.class, "StyleSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getStyleSelector_Kind(), this.getElementKind(), "kind", null, 0, 1, StyleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getStyleSelector_Class(), theDCPackage.getString(), "class", null, 0, -1, StyleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(ellipseEClass, Ellipse.class, "Ellipse", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getEllipse_Center(), theDCPackage.getPoint(), null, "center", null, 1, 1, Ellipse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getEllipse_Radii(), theDCPackage.getDimension(), null, "radii", null, 1, 1, Ellipse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(ellipticalArcToEClass, EllipticalArcTo.class, "EllipticalArcTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getEllipticalArcTo_Radii(), theDCPackage.getDimension(), null, "radii", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getEllipticalArcTo_Rotation(), theDCPackage.getReal(), "rotation", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getEllipticalArcTo_IsLargeArc(), theDCPackage.getBoolean(), "isLargeArc", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getEllipticalArcTo_IsSweep(), theDCPackage.getBoolean(), "isSweep", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getEllipticalArcTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(quadraticCurveToEClass, QuadraticCurveTo.class, "QuadraticCurveTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getQuadraticCurveTo_Control(), theDCPackage.getPoint(), null, "control", null, 1, 1, QuadraticCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getQuadraticCurveTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, QuadraticCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(gradientEClass, Gradient.class, "Gradient", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getGradient_Stop(), this.getGradientStop(), null, "stop", null, 2, -1, Gradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(gradientStopEClass, GradientStop.class, "GradientStop", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getGradientStop_Color(), theDCPackage.getColor(), "color", null, 0, 1, GradientStop.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getGradientStop_Offset(), theDCPackage.getReal(), "offset", null, 0, 1, GradientStop.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getGradientStop_Opacity(), theDCPackage.getReal(), "opacity", null, 0, 1, GradientStop.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getGradientStop__ValidOffset__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validOffset", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2704,12 +2279,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		op = initEOperation(
-				getGradientStop__ValidOpacity__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "validOpacity", 0, 1, IS_UNIQUE,
-				IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		op = initEOperation(getGradientStop__ValidOpacity__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validOpacity", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2717,27 +2288,13 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(imageEClass, Image.class, "Image", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getImage_Source(), theDCPackage.getString(), "source",
-				null, 1, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getImage_Bounds(), theDCPackage.getBounds(), null,
-				"bounds", null, 1, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getImage_IsAspectRatioPreserved(),
-				theDCPackage.getBoolean(), "isAspectRatioPreserved", "false",
-				1, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		op = initEOperation(
-				getImage__SourceCannotBeEmpty__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "sourceCannotBeEmpty", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(imageEClass, Image.class, "Image", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getImage_Source(), theDCPackage.getString(), "source", null, 1, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getImage_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 1, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getImage_IsAspectRatioPreserved(), theDCPackage.getBoolean(), "isAspectRatioPreserved", "false", 1, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getImage__SourceCannotBeEmpty__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "sourceCannotBeEmpty", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2745,38 +2302,17 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(lineEClass, Line.class, "Line", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLine_Start(), theDCPackage.getPoint(), null, "start",
-				null, 1, 1, Line.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getLine_End(), theDCPackage.getPoint(), null, "end",
-				null, 1, 1, Line.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(markedElementEClass, MarkedElement.class, "MarkedElement",
-				IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMarkedElement_EndMarker(), this.getMarker(), null,
-				"endMarker", null, 0, 1, MarkedElement.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getMarkedElement_MidMarker(), this.getMarker(), null,
-				"midMarker", null, 0, 1, MarkedElement.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getMarkedElement_StartMarker(), this.getMarker(), null,
-				"startMarker", null, 0, 1, MarkedElement.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		op = initEOperation(
-				getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "referencedStartMarkerHasId", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(lineEClass, Line.class, "Line", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getLine_Start(), theDCPackage.getPoint(), null, "start", null, 1, 1, Line.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getLine_End(), theDCPackage.getPoint(), null, "end", null, 1, 1, Line.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(markedElementEClass, MarkedElement.class, "MarkedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getMarkedElement_EndMarker(), this.getMarker(), null, "endMarker", null, 0, 1, MarkedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getMarkedElement_MidMarker(), this.getMarker(), null, "midMarker", null, 0, 1, MarkedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getMarkedElement_StartMarker(), this.getMarker(), null, "startMarker", null, 0, 1, MarkedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedStartMarkerHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2784,12 +2320,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		op = initEOperation(
-				getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "referencedMidMarkerHasId", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		op = initEOperation(getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedMidMarkerHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2797,12 +2329,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		op = initEOperation(
-				getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "referencedEndMarkerHasId", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		op = initEOperation(getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedEndMarkerHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2810,35 +2338,16 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(markerEClass, Marker.class, "Marker", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMarker_Size(), theDCPackage.getDimension(), null,
-				"size", null, 1, 1, Marker.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getMarker_Reference(), theDCPackage.getPoint(), null,
-				"reference", null, 1, 1, Marker.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(linearGradientEClass, LinearGradient.class,
-				"LinearGradient", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLinearGradient_Start(), theDCPackage.getPoint(),
-				null, "start", null, 1, 1, LinearGradient.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getLinearGradient_End(), theDCPackage.getPoint(), null,
-				"end", null, 1, 1, LinearGradient.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		op = initEOperation(
-				getLinearGradient__ValidGradientVector__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "validGradientVector", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(markerEClass, Marker.class, "Marker", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getMarker_Size(), theDCPackage.getDimension(), null, "size", null, 1, 1, Marker.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getMarker_Reference(), theDCPackage.getPoint(), null, "reference", null, 1, 1, Marker.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(linearGradientEClass, LinearGradient.class, "LinearGradient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getLinearGradient_Start(), theDCPackage.getPoint(), null, "start", null, 1, 1, LinearGradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getLinearGradient_End(), theDCPackage.getPoint(), null, "end", null, 1, 1, LinearGradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getLinearGradient__ValidGradientVector__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validGradientVector", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2846,47 +2355,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(lineToEClass, LineTo.class, "LineTo", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLineTo_Point(), theDCPackage.getPoint(), null,
-				"point", null, 1, 1, LineTo.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(matrixEClass, Matrix.class, "Matrix", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMatrix_A(), theDCPackage.getReal(), "a", null, 1, 1,
-				Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getMatrix_B(), theDCPackage.getReal(), "b", null, 1, 1,
-				Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getMatrix_C(), theDCPackage.getReal(), "c", null, 1, 1,
-				Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getMatrix_D(), theDCPackage.getReal(), "d", null, 1, 1,
-				Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getMatrix_E(), theDCPackage.getReal(), "e", null, 1, 1,
-				Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getMatrix_F(), theDCPackage.getReal(), "f", null, 1, 1,
-				Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(pathEClass, Path.class, "Path", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPath_Command(), this.getPathCommand(), null,
-				"command", null, 1, -1, Path.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		op = initEOperation(
-				getPath__FirstCommandMustBeMove__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "firstCommandMustBeMove", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(lineToEClass, LineTo.class, "LineTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getLineTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, LineTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(matrixEClass, Matrix.class, "Matrix", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getMatrix_A(), theDCPackage.getReal(), "a", null, 1, 1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getMatrix_B(), theDCPackage.getReal(), "b", null, 1, 1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getMatrix_C(), theDCPackage.getReal(), "c", null, 1, 1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getMatrix_D(), theDCPackage.getReal(), "d", null, 1, 1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getMatrix_E(), theDCPackage.getReal(), "e", null, 1, 1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getMatrix_F(), theDCPackage.getReal(), "f", null, 1, 1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(pathEClass, Path.class, "Path", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getPath_Command(), this.getPathCommand(), null, "command", null, 1, -1, Path.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		op = initEOperation(getPath__FirstCommandMustBeMove__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "firstCommandMustBeMove", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2894,54 +2378,23 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(patternEClass, Pattern.class, "Pattern", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPattern_Bounds(), theDCPackage.getBounds(), null,
-				"bounds", null, 1, 1, Pattern.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getPattern_Tile(), this.getGraphicalElement(), null,
-				"tile", null, 1, 1, Pattern.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(polygonEClass, Polygon.class, "Polygon", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPolygon_Point(), theDCPackage.getPoint(), null,
-				"point", null, 3, -1, Polygon.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(polylineEClass, Polyline.class, "Polyline", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPolyline_Point(), theDCPackage.getPoint(), null,
-				"point", null, 2, -1, Polyline.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(radialGradientEClass, RadialGradient.class,
-				"RadialGradient", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getRadialGradient_Center(), theDCPackage.getPoint(),
-				null, "center", null, 1, 1, RadialGradient.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getRadialGradient_Focus(), theDCPackage.getPoint(),
-				null, "focus", null, 1, 1, RadialGradient.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getRadialGradient_Radius(), theDCPackage.getReal(),
-				"radius", "0.5", 1, 1, RadialGradient.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-
-		op = initEOperation(
-				getRadialGradient__ValidCenterPoint__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "validCenterPoint", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(patternEClass, Pattern.class, "Pattern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getPattern_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 1, 1, Pattern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getPattern_Tile(), this.getGraphicalElement(), null, "tile", null, 1, 1, Pattern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(polygonEClass, Polygon.class, "Polygon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getPolygon_Point(), theDCPackage.getPoint(), null, "point", null, 3, -1, Polygon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(polylineEClass, Polyline.class, "Polyline", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getPolyline_Point(), theDCPackage.getPoint(), null, "point", null, 2, -1, Polyline.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(radialGradientEClass, RadialGradient.class, "RadialGradient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getRadialGradient_Center(), theDCPackage.getPoint(), null, "center", null, 1, 1, RadialGradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getRadialGradient_Focus(), theDCPackage.getPoint(), null, "focus", null, 1, 1, RadialGradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getRadialGradient_Radius(), theDCPackage.getReal(), "radius", "0.5", 1, 1, RadialGradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getRadialGradient__ValidCenterPoint__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validCenterPoint", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2949,12 +2402,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		op = initEOperation(
-				getRadialGradient__ValidFocusPoint__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "validFocusPoint", 0, 1, IS_UNIQUE,
-				IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		op = initEOperation(getRadialGradient__ValidFocusPoint__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validFocusPoint", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2962,12 +2411,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		op = initEOperation(
-				getRadialGradient__ValidRadius__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "validRadius", 0, 1, IS_UNIQUE,
-				IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		op = initEOperation(getRadialGradient__ValidRadius__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validRadius", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2975,23 +2420,12 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(rectangleEClass, Rectangle.class, "Rectangle", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getRectangle_Bounds(), theDCPackage.getBounds(), null,
-				"bounds", null, 1, 1, Rectangle.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getRectangle_CornerRadius(), theDCPackage.getReal(),
-				"cornerRadius", "0", 0, 1, Rectangle.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-
-		op = initEOperation(
-				getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "nonNegativeCornerRadius", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(rectangleEClass, Rectangle.class, "Rectangle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getRectangle_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 1, 1, Rectangle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getRectangle_CornerRadius(), theDCPackage.getReal(), "cornerRadius", "0", 0, 1, Rectangle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeCornerRadius", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -2999,50 +2433,22 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(rootCanvasEClass, RootCanvas.class, "RootCanvas",
-				!IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRootCanvas_BackgroundColor(),
-				theDCPackage.getColor(), "backgroundColor", null, 0, 1,
-				RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getRootCanvas_Definitions(), this.getDefinitions(),
-				null, "definitions", null, 0, 1, RootCanvas.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-		initEReference(getRootCanvas_ExternalStyleSheet(),
-				this.getStyleSheet(), null, "externalStyleSheet", null, 0, -1,
-				RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-
-		initEClass(rotateEClass, Rotate.class, "Rotate", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRotate_Angle(), theDCPackage.getReal(), "angle",
-				null, 1, 1, Rotate.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEReference(getRotate_Center(), theDCPackage.getPoint(), null,
-				"center", null, 0, 1, Rotate.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(scaleEClass, Scale.class, "Scale", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getScale_FactorX(), theDCPackage.getReal(), "factorX",
-				null, 1, 1, Scale.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEAttribute(getScale_FactorY(), theDCPackage.getReal(), "factorY",
-				null, 1, 1, Scale.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-
-		op = initEOperation(getScale__Nonnegativescale__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "nonnegativescale", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(rootCanvasEClass, RootCanvas.class, "RootCanvas", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getRootCanvas_BackgroundColor(), theDCPackage.getColor(), "backgroundColor", null, 0, 1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getRootCanvas_Definitions(), this.getDefinitions(), null, "definitions", null, 0, 1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getRootCanvas_ExternalStyleSheet(), this.getStyleSheet(), null, "externalStyleSheet", null, 0, -1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getRootCanvas_Script(), theDCPackage.getString(), "script", null, 0, -1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(rotateEClass, Rotate.class, "Rotate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getRotate_Angle(), theDCPackage.getReal(), "angle", null, 1, 1, Rotate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getRotate_Center(), theDCPackage.getPoint(), null, "center", null, 0, 1, Rotate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(scaleEClass, Scale.class, "Scale", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getScale_FactorX(), theDCPackage.getReal(), "factorX", null, 1, 1, Scale.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getScale_FactorY(), theDCPackage.getReal(), "factorY", null, 1, 1, Scale.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getScale__Nonnegativescale__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonnegativescale", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -3050,32 +2456,17 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(skewEClass, Skew.class, "Skew", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSkew_AngleX(), theDCPackage.getReal(), "angleX",
-				null, 1, 1, Skew.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEAttribute(getSkew_AngleY(), theDCPackage.getReal(), "angleY",
-				null, 1, 1, Skew.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-
-		initEClass(textEClass, Text.class, "Text", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getText_Data(), theDCPackage.getString(), "data", null,
-				1, 1, Text.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
-				!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getText_Position(), theDCPackage.getPoint(), null,
-				"position", null, 1, 1, Text.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		op = initEOperation(getText__DataCannotBeEmpty__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "dataCannotBeEmpty", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(skewEClass, Skew.class, "Skew", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getSkew_AngleX(), theDCPackage.getReal(), "angleX", null, 1, 1, Skew.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getSkew_AngleY(), theDCPackage.getReal(), "angleY", null, 1, 1, Skew.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(textEClass, Text.class, "Text", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getText_Data(), theDCPackage.getString(), "data", null, 1, 1, Text.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getText_Position(), theDCPackage.getPoint(), null, "position", null, 1, 1, Text.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getText_Anchor(), this.getTextAnchor(), "anchor", null, 0, 1, Text.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		op = initEOperation(getText__DataCannotBeEmpty__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "dataCannotBeEmpty", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -3083,35 +2474,16 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
 
-		initEClass(translateEClass, Translate.class, "Translate", !IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTranslate_DeltaX(), theDCPackage.getReal(), "deltaX",
-				null, 1, 1, Translate.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEAttribute(getTranslate_DeltaY(), theDCPackage.getReal(), "deltaY",
-				null, 1, 1, Translate.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-
-		initEClass(useEClass, Use.class, "Use", !IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getUse_Bounds(), theDCPackage.getBounds(), null,
-				"bounds", null, 0, 1, Use.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getUse_ReferencedElement(), this.getGraphicalElement(),
-				null, "referencedElement", null, 1, 1, Use.class,
-				!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-				IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-
-		op = initEOperation(
-				getUse__ReferencedElementHasId__DiagnosticChain_Map(),
-				ecorePackage.getEBoolean(), "referencedElementHasId", 0, 1,
-				IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0,
-				1, IS_UNIQUE, IS_ORDERED);
+		initEClass(translateEClass, Translate.class, "Translate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTranslate_DeltaX(), theDCPackage.getReal(), "deltaX", null, 1, 1, Translate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getTranslate_DeltaY(), theDCPackage.getReal(), "deltaY", null, 1, 1, Translate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(useEClass, Use.class, "Use", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getUse_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 0, 1, Use.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getUse_ReferencedElement(), this.getGraphicalElement(), null, "referencedElement", null, 1, 1, Use.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		op = initEOperation(getUse__ReferencedElementHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedElementHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
@@ -3141,6 +2513,11 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		addEEnumLiteral(elementKindEEnum, ElementKind.TEXT);
 		addEEnumLiteral(elementKindEEnum, ElementKind.USE);
 
+		initEEnum(textAnchorEEnum, TextAnchor.class, "TextAnchor");
+		addEEnumLiteral(textAnchorEEnum, TextAnchor.START);
+		addEEnumLiteral(textAnchorEEnum, TextAnchor.MIDDLE);
+		addEEnumLiteral(textAnchorEEnum, TextAnchor.END);
+
 		// Create resource
 		createResource(eNS_URI);
 
@@ -3152,113 +2529,179 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	}
 
 	/**
-	 * Initializes the annotations for
-	 * <b>http://www.eclipse.org/emf/2002/Ecore</b>. <!-- begin-user-doc -->
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected void createEcoreAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore";
-		addAnnotation(this, source, new String[] { "validationDelegates",
-				"http://www.eclipse.org/emf/2002/Ecore/OCL" });
+		String source = "http://www.eclipse.org/emf/2002/Ecore";			
+		addAnnotation
+		  (this, 
+		   source, 
+		   new String[] {
+			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL"
+		   });																																																																																																																																																																																																																									
 	}
 
 	/**
-	 * Initializes the annotations for
-	 * <b>http://www.eclipse.org/emf/2002/Ecore/OCL</b>. <!-- begin-user-doc -->
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL</b>.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected void createOCLAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";
-		addAnnotation(
-				getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(),
-				source, new String[] { "body", "transform->isEmpty()" });
-		addAnnotation(
-				getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(),
-				source,
-				new String[] { "body",
-						"clipPath->notEmpty() implies clipPath.id->notEmpty()" });
-		addAnnotation(getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(),
-				source, new String[] { "body",
-						"id->notEmpty() implies id.size() > 0" });
-		addAnnotation(getStyle__ValidFontSize__DiagnosticChain_Map(), source,
-				new String[] { "body", "fontSize >=  0" });
-		addAnnotation(getStyle__ValidFillOpacity__DiagnosticChain_Map(),
-				source, new String[] { "body",
-						"fillOpacity >=  0 and fillOpacity <=1" });
-		addAnnotation(getStyle__ValidStrokeWidth__DiagnosticChain_Map(),
-				source, new String[] { "body", "strokeWidth >=  0" });
-		addAnnotation(getStyle__ValidDashLengthSize__DiagnosticChain_Map(),
-				source, new String[] { "body",
-						"strokeDashLength->size().mod(2) = 0" });
-		addAnnotation(getStyle__ValidStrokeOpacity__DiagnosticChain_Map(),
-				source, new String[] { "body",
-						"strokeOpacity >=  0 and strokeOpacity <=1" });
-		addAnnotation(
-				getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(),
-				source,
-				new String[] { "body",
-						"paintServer->notEmpty() implies paintServer.id->notEmpty()" });
-		addAnnotation(getCircle__NonNegativeRadius__DiagnosticChain_Map(),
-				source, new String[] { "body", "radius >= 0" });
-		addAnnotation(getGradientStop__ValidOffset__DiagnosticChain_Map(),
-				source, new String[] { "body", "offset>=0 and offset<=1" });
-		addAnnotation(getGradientStop__ValidOpacity__DiagnosticChain_Map(),
-				source, new String[] { "body", "opacity>=0 and opacity<=1" });
-		addAnnotation(getImage__SourceCannotBeEmpty__DiagnosticChain_Map(),
-				source, new String[] { "body",
-						"source->notEmpty() implies source.size() > 0" });
-		addAnnotation(
-				getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(),
-				source,
-				new String[] { "body",
-						"startMarker->notEmpty() implies startMarker.id->notEmpty()" });
-		addAnnotation(
-				getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(),
-				source,
-				new String[] { "body",
-						"midMarker->notEmpty() implies midMarker.id->notEmpty()" });
-		addAnnotation(
-				getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(),
-				source,
-				new String[] { "body",
-						"endMarker->notEmpty() implies endMarker.id->notEmpty()" });
-		addAnnotation(
-				getLinearGradient__ValidGradientVector__DiagnosticChain_Map(),
-				source,
-				new String[] {
-						"body",
-						"start.x>=0 and start.x<=1 and end.x>=0 and end.x<=1 and start.y>=0 and start.y<=1 and end.y>=0 and end.y<=1" });
-		addAnnotation(getPath__FirstCommandMustBeMove__DiagnosticChain_Map(),
-				source, new String[] { "body",
-						"command->first().oclIsKindOf(MoveTo)" });
-		addAnnotation(
-				getRadialGradient__ValidCenterPoint__DiagnosticChain_Map(),
-				source,
-				new String[] { "body",
-						"centerX>=0 and centerX<=1 and centerY>=0 and centerY<=1" });
-		addAnnotation(
-				getRadialGradient__ValidFocusPoint__DiagnosticChain_Map(),
-				source, new String[] { "body",
-						"focusX>=0 and focusX<=1 and focusY>=0 and focusY<=1" });
-		addAnnotation(getRadialGradient__ValidRadius__DiagnosticChain_Map(),
-				source, new String[] { "body", "radius>=0 and radius<=1" });
-		addAnnotation(
-				getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(),
-				source, new String[] { "body", "cornerRadius >= 0" });
-		addAnnotation(getScale__Nonnegativescale__DiagnosticChain_Map(),
-				source, new String[] { "body", "factorX>=0 and factorY>=0" });
-		addAnnotation(getText__DataCannotBeEmpty__DiagnosticChain_Map(),
-				source, new String[] { "body",
-						"data->notEmpty() implies data.size() > 0" });
-		addAnnotation(
-				getUse__ReferencedElementHasId__DiagnosticChain_Map(),
-				source,
-				new String[] { "body",
-						"referencedElement->notEmpty() implies referencedElement.id->notEmpty()" });
+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";					
+		addAnnotation
+		  (getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "transform->isEmpty()"
+		   });								
+		addAnnotation
+		  (getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "clipPath->notEmpty() implies clipPath.id->notEmpty()"
+		   });									
+		addAnnotation
+		  (getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "id->notEmpty() implies id.size() > 0"
+		   });											
+		addAnnotation
+		  (getStyle__ValidFontSize__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "fontSize >=  0"
+		   });					
+		addAnnotation
+		  (getStyle__ValidFillOpacity__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "fillOpacity >=  0 and fillOpacity <=1"
+		   });					
+		addAnnotation
+		  (getStyle__ValidStrokeWidth__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "strokeWidth >=  0"
+		   });					
+		addAnnotation
+		  (getStyle__ValidDashLengthSize__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "strokeDashLength->size().mod(2) = 0"
+		   });					
+		addAnnotation
+		  (getStyle__ValidStrokeOpacity__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "strokeOpacity >=  0 and strokeOpacity <=1"
+		   });																
+		addAnnotation
+		  (getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "paintServer->notEmpty() implies paintServer.id->notEmpty()"
+		   });										
+		addAnnotation
+		  (getCircle__NonNegativeRadius__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "radius >= 0"
+		   });																																	
+		addAnnotation
+		  (getGradientStop__ValidOffset__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "offset>=0 and offset<=1"
+		   });					
+		addAnnotation
+		  (getGradientStop__ValidOpacity__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "opacity>=0 and opacity<=1"
+		   });									
+		addAnnotation
+		  (getImage__SourceCannotBeEmpty__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "source->notEmpty() implies source.size() > 0"
+		   });											
+		addAnnotation
+		  (getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "startMarker->notEmpty() implies startMarker.id->notEmpty()"
+		   });				
+		addAnnotation
+		  (getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "midMarker->notEmpty() implies midMarker.id->notEmpty()"
+		   });				
+		addAnnotation
+		  (getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "endMarker->notEmpty() implies endMarker.id->notEmpty()"
+		   });											
+		addAnnotation
+		  (getLinearGradient__ValidGradientVector__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "start.x>=0 and start.x<=1 and end.x>=0 and end.x<=1 and start.y>=0 and start.y<=1 and end.y>=0 and end.y<=1"
+		   });																	
+		addAnnotation
+		  (getPath__FirstCommandMustBeMove__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "command->first().oclIsKindOf(MoveTo)"
+		   });													
+		addAnnotation
+		  (getRadialGradient__ValidCenterPoint__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "centerX>=0 and centerX<=1 and centerY>=0 and centerY<=1"
+		   });					
+		addAnnotation
+		  (getRadialGradient__ValidFocusPoint__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "focusX>=0 and focusX<=1 and focusY>=0 and focusY<=1"
+		   });					
+		addAnnotation
+		  (getRadialGradient__ValidRadius__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "radius>=0 and radius<=1"
+		   });									
+		addAnnotation
+		  (getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "cornerRadius >= 0"
+		   });														
+		addAnnotation
+		  (getScale__Nonnegativescale__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "factorX>=0 and factorY>=0"
+		   });											
+		addAnnotation
+		  (getText__DataCannotBeEmpty__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "data->notEmpty() implies data.size() > 0"
+		   });										
+		addAnnotation
+		  (getUse__ReferencedElementHasId__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "referencedElement->notEmpty() implies referencedElement.id->notEmpty()"
+		   });				
 	}
 
 } // DGPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java
index cf5e63c411d..1cd36f5d448 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java
@@ -33,10 +33,10 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionImpl#getId <em>Id</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionImpl#getId <em>Id</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
@@ -63,7 +63,6 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected DefinitionImpl() {
@@ -72,7 +71,6 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -82,7 +80,6 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -91,25 +88,20 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- 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,
-					DGPackage.DEFINITION__ID, oldId, id));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.DEFINITION__ID, oldId, id));
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Id Cannot Be Empty</em>}' invariant operation. <!-- begin-user-doc
+	 * The cached validation expression for the '{@link #idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Id Cannot Be Empty</em>}' invariant operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -117,85 +109,80 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean idCannotBeEmpty(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.DEFINITION,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP,
-						ID_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.DEFINITION__ID_CANNOT_BE_EMPTY);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.DEFINITION,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP,
+				 ID_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.DEFINITION__ID_CANNOT_BE_EMPTY);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.DEFINITION__ID:
-			return getId();
+			case DGPackage.DEFINITION__ID:
+				return getId();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.DEFINITION__ID:
-			setId((String) newValue);
-			return;
+			case DGPackage.DEFINITION__ID:
+				setId((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.DEFINITION__ID:
-			setId(ID_EDEFAULT);
-			return;
+			case DGPackage.DEFINITION__ID:
+				setId(ID_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.DEFINITION__ID:
-			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+			case DGPackage.DEFINITION__ID:
+				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -203,22 +190,19 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
-			return idCannotBeEmpty((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
+				return idCannotBeEmpty((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (id: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java
index e46b3c59200..b3521d2d9f5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java
@@ -38,21 +38,18 @@ import org.eclipse.papyrus.dd.dg.StyleSheet;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getDefnitions <em>
- * Defnition</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getStyleSheet <em>
- * Style Sheet</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getDefnitions <em>Defnition</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getStyleSheet <em>Style Sheet</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 		Definitions {
 	/**
-	 * The cached value of the '{@link #getDefnitions() <em>Defnition</em>}'
-	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getDefnitions() <em>Defnition</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDefnitions()
 	 * @generated
 	 * @ordered
@@ -60,9 +57,8 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 	protected EList<Definition> defnitions;
 
 	/**
-	 * The cached value of the '{@link #getStyleSheet() <em>Style Sheet</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getStyleSheet() <em>Style Sheet</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getStyleSheet()
 	 * @generated
 	 * @ordered
@@ -71,7 +67,6 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected DefinitionsImpl() {
@@ -80,7 +75,6 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -90,20 +84,17 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<Definition> getDefnitions() {
 		if (defnitions == null) {
-			defnitions = new EObjectContainmentEList<Definition>(
-					Definition.class, this, DGPackage.DEFINITIONS__DEFNITION);
+			defnitions = new EObjectContainmentEList<Definition>(Definition.class, this, DGPackage.DEFINITIONS__DEFNITION);
 		}
 		return defnitions;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public StyleSheet getStyleSheet() {
@@ -112,7 +103,6 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetStyleSheet(StyleSheet newStyleSheet,
@@ -120,128 +110,108 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 		StyleSheet oldStyleSheet = styleSheet;
 		styleSheet = newStyleSheet;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.DEFINITIONS__STYLE_SHEET,
-					oldStyleSheet, newStyleSheet);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.DEFINITIONS__STYLE_SHEET, oldStyleSheet, newStyleSheet);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setStyleSheet(StyleSheet newStyleSheet) {
 		if (newStyleSheet != styleSheet) {
 			NotificationChain msgs = null;
 			if (styleSheet != null)
-				msgs = ((InternalEObject) styleSheet).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.DEFINITIONS__STYLE_SHEET, null,
-						msgs);
+				msgs = ((InternalEObject)styleSheet).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.DEFINITIONS__STYLE_SHEET, null, msgs);
 			if (newStyleSheet != null)
-				msgs = ((InternalEObject) newStyleSheet).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.DEFINITIONS__STYLE_SHEET, null,
-						msgs);
+				msgs = ((InternalEObject)newStyleSheet).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.DEFINITIONS__STYLE_SHEET, null, msgs);
 			msgs = basicSetStyleSheet(newStyleSheet, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.DEFINITIONS__STYLE_SHEET, newStyleSheet,
-					newStyleSheet));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.DEFINITIONS__STYLE_SHEET, newStyleSheet, newStyleSheet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.DEFINITIONS__DEFNITION:
-			return ((InternalEList<?>) getDefnitions()).basicRemove(otherEnd,
-					msgs);
-		case DGPackage.DEFINITIONS__STYLE_SHEET:
-			return basicSetStyleSheet(null, msgs);
+			case DGPackage.DEFINITIONS__DEFNITION:
+				return ((InternalEList<?>)getDefnitions()).basicRemove(otherEnd, msgs);
+			case DGPackage.DEFINITIONS__STYLE_SHEET:
+				return basicSetStyleSheet(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.DEFINITIONS__DEFNITION:
-			return getDefnitions();
-		case DGPackage.DEFINITIONS__STYLE_SHEET:
-			return getStyleSheet();
+			case DGPackage.DEFINITIONS__DEFNITION:
+				return getDefnitions();
+			case DGPackage.DEFINITIONS__STYLE_SHEET:
+				return getStyleSheet();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.DEFINITIONS__DEFNITION:
-			getDefnitions().clear();
-			getDefnitions().addAll((Collection<? extends Definition>) newValue);
-			return;
-		case DGPackage.DEFINITIONS__STYLE_SHEET:
-			setStyleSheet((StyleSheet) newValue);
-			return;
+			case DGPackage.DEFINITIONS__DEFNITION:
+				getDefnitions().clear();
+				getDefnitions().addAll((Collection<? extends Definition>)newValue);
+				return;
+			case DGPackage.DEFINITIONS__STYLE_SHEET:
+				setStyleSheet((StyleSheet)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.DEFINITIONS__DEFNITION:
-			getDefnitions().clear();
-			return;
-		case DGPackage.DEFINITIONS__STYLE_SHEET:
-			setStyleSheet((StyleSheet) null);
-			return;
+			case DGPackage.DEFINITIONS__DEFNITION:
+				getDefnitions().clear();
+				return;
+			case DGPackage.DEFINITIONS__STYLE_SHEET:
+				setStyleSheet((StyleSheet)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.DEFINITIONS__DEFNITION:
-			return defnitions != null && !defnitions.isEmpty();
-		case DGPackage.DEFINITIONS__STYLE_SHEET:
-			return styleSheet != null;
+			case DGPackage.DEFINITIONS__DEFNITION:
+				return defnitions != null && !defnitions.isEmpty();
+			case DGPackage.DEFINITIONS__STYLE_SHEET:
+				return styleSheet != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java
index d72bed1544f..9254b23df08 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java
@@ -31,20 +31,17 @@ import org.eclipse.papyrus.dd.dg.Ellipse;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl#getCenter <em>Center
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl#getRadii <em>Radii
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl#getCenter <em>Center</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl#getRadii <em>Radii</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 	/**
-	 * The cached value of the '{@link #getCenter() <em>Center</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getCenter() <em>Center</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCenter()
 	 * @generated
 	 * @ordered
@@ -52,9 +49,8 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 	protected Point center;
 
 	/**
-	 * The cached value of the '{@link #getRadii() <em>Radii</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getRadii() <em>Radii</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getRadii()
 	 * @generated
 	 * @ordered
@@ -63,7 +59,6 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected EllipseImpl() {
@@ -72,7 +67,6 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -82,7 +76,6 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getCenter() {
@@ -91,7 +84,6 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetCenter(Point newCenter,
@@ -99,44 +91,32 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 		Point oldCenter = center;
 		center = newCenter;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.ELLIPSE__CENTER, oldCenter,
-					newCenter);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPSE__CENTER, oldCenter, newCenter);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setCenter(Point newCenter) {
 		if (newCenter != center) {
 			NotificationChain msgs = null;
 			if (center != null)
-				msgs = ((InternalEObject) center).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__CENTER,
-						null, msgs);
+				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__CENTER, null, msgs);
 			if (newCenter != null)
-				msgs = ((InternalEObject) newCenter).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__CENTER,
-						null, msgs);
+				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__CENTER, null, msgs);
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.ELLIPSE__CENTER, newCenter, newCenter));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPSE__CENTER, newCenter, newCenter));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Dimension getRadii() {
@@ -145,7 +125,6 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetRadii(Dimension newRadii,
@@ -153,122 +132,106 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 		Dimension oldRadii = radii;
 		radii = newRadii;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.ELLIPSE__RADII, oldRadii,
-					newRadii);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPSE__RADII, oldRadii, newRadii);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setRadii(Dimension newRadii) {
 		if (newRadii != radii) {
 			NotificationChain msgs = null;
 			if (radii != null)
-				msgs = ((InternalEObject) radii).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__RADII,
-						null, msgs);
+				msgs = ((InternalEObject)radii).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__RADII, null, msgs);
 			if (newRadii != null)
-				msgs = ((InternalEObject) newRadii).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__RADII,
-						null, msgs);
+				msgs = ((InternalEObject)newRadii).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__RADII, null, msgs);
 			msgs = basicSetRadii(newRadii, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.ELLIPSE__RADII, newRadii, newRadii));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPSE__RADII, newRadii, newRadii));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.ELLIPSE__CENTER:
-			return basicSetCenter(null, msgs);
-		case DGPackage.ELLIPSE__RADII:
-			return basicSetRadii(null, msgs);
+			case DGPackage.ELLIPSE__CENTER:
+				return basicSetCenter(null, msgs);
+			case DGPackage.ELLIPSE__RADII:
+				return basicSetRadii(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.ELLIPSE__CENTER:
-			return getCenter();
-		case DGPackage.ELLIPSE__RADII:
-			return getRadii();
+			case DGPackage.ELLIPSE__CENTER:
+				return getCenter();
+			case DGPackage.ELLIPSE__RADII:
+				return getRadii();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.ELLIPSE__CENTER:
-			setCenter((Point) newValue);
-			return;
-		case DGPackage.ELLIPSE__RADII:
-			setRadii((Dimension) newValue);
-			return;
+			case DGPackage.ELLIPSE__CENTER:
+				setCenter((Point)newValue);
+				return;
+			case DGPackage.ELLIPSE__RADII:
+				setRadii((Dimension)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.ELLIPSE__CENTER:
-			setCenter((Point) null);
-			return;
-		case DGPackage.ELLIPSE__RADII:
-			setRadii((Dimension) null);
-			return;
+			case DGPackage.ELLIPSE__CENTER:
+				setCenter((Point)null);
+				return;
+			case DGPackage.ELLIPSE__RADII:
+				setRadii((Dimension)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.ELLIPSE__CENTER:
-			return center != null;
-		case DGPackage.ELLIPSE__RADII:
-			return radii != null;
+			case DGPackage.ELLIPSE__CENTER:
+				return center != null;
+			case DGPackage.ELLIPSE__RADII:
+				return radii != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java
index d3289965e48..370a3280fda 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java
@@ -31,27 +31,21 @@ import org.eclipse.papyrus.dd.dg.EllipticalArcTo;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getRadii <em>
- * Radii</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getRotation
- * <em>Rotation</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#isLargeArc <em>
- * Is Large Arc</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#isSweep <em>Is
- * Sweep</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getPoint <em>
- * Point</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getRadii <em>Radii</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getRotation <em>Rotation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#isLargeArc <em>Is Large Arc</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#isSweep <em>Is Sweep</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class EllipticalArcToImpl extends PathCommandImpl implements
 		EllipticalArcTo {
 	/**
-	 * The cached value of the '{@link #getRadii() <em>Radii</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getRadii() <em>Radii</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getRadii()
 	 * @generated
 	 * @ordered
@@ -59,9 +53,8 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	protected Dimension radii;
 
 	/**
-	 * The default value of the '{@link #getRotation() <em>Rotation</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getRotation() <em>Rotation</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getRotation()
 	 * @generated
 	 * @ordered
@@ -69,9 +62,8 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	protected static final double ROTATION_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getRotation() <em>Rotation</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getRotation() <em>Rotation</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getRotation()
 	 * @generated
 	 * @ordered
@@ -79,9 +71,8 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	protected double rotation = ROTATION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isLargeArc() <em>Is Large Arc</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #isLargeArc() <em>Is Large Arc</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isLargeArc()
 	 * @generated
 	 * @ordered
@@ -89,9 +80,8 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	protected static final boolean IS_LARGE_ARC_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isLargeArc() <em>Is Large Arc</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #isLargeArc() <em>Is Large Arc</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isLargeArc()
 	 * @generated
 	 * @ordered
@@ -99,9 +89,8 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	protected boolean isLargeArc = IS_LARGE_ARC_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isSweep() <em>Is Sweep</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #isSweep() <em>Is Sweep</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isSweep()
 	 * @generated
 	 * @ordered
@@ -111,7 +100,6 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	/**
 	 * The cached value of the '{@link #isSweep() <em>Is Sweep</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #isSweep()
 	 * @generated
 	 * @ordered
@@ -119,9 +107,8 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	protected boolean isSweep = IS_SWEEP_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getPoint()
 	 * @generated
 	 * @ordered
@@ -130,7 +117,6 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected EllipticalArcToImpl() {
@@ -139,7 +125,6 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -149,7 +134,6 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Dimension getRadii() {
@@ -158,7 +142,6 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetRadii(Dimension newRadii,
@@ -166,46 +149,32 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 		Dimension oldRadii = radii;
 		radii = newRadii;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__RADII,
-					oldRadii, newRadii);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__RADII, oldRadii, newRadii);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setRadii(Dimension newRadii) {
 		if (newRadii != radii) {
 			NotificationChain msgs = null;
 			if (radii != null)
-				msgs = ((InternalEObject) radii).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.ELLIPTICAL_ARC_TO__RADII, null,
-						msgs);
+				msgs = ((InternalEObject)radii).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__RADII, null, msgs);
 			if (newRadii != null)
-				msgs = ((InternalEObject) newRadii).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.ELLIPTICAL_ARC_TO__RADII, null,
-						msgs);
+				msgs = ((InternalEObject)newRadii).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__RADII, null, msgs);
 			msgs = basicSetRadii(newRadii, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.ELLIPTICAL_ARC_TO__RADII, newRadii, newRadii));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__RADII, newRadii, newRadii));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getRotation() {
@@ -214,21 +183,17 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setRotation(double newRotation) {
 		double oldRotation = rotation;
 		rotation = newRotation;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.ELLIPTICAL_ARC_TO__ROTATION, oldRotation,
-					rotation));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__ROTATION, oldRotation, rotation));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isLargeArc() {
@@ -237,21 +202,17 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setIsLargeArc(boolean newIsLargeArc) {
 		boolean oldIsLargeArc = isLargeArc;
 		isLargeArc = newIsLargeArc;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC, oldIsLargeArc,
-					isLargeArc));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC, oldIsLargeArc, isLargeArc));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSweep() {
@@ -260,20 +221,17 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setIsSweep(boolean newIsSweep) {
 		boolean oldIsSweep = isSweep;
 		isSweep = newIsSweep;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP, oldIsSweep, isSweep));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP, oldIsSweep, isSweep));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getPoint() {
@@ -282,7 +240,6 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetPoint(Point newPoint,
@@ -290,167 +247,147 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 		Point oldPoint = point;
 		point = newPoint;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__POINT,
-					oldPoint, newPoint);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__POINT, oldPoint, newPoint);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setPoint(Point newPoint) {
 		if (newPoint != point) {
 			NotificationChain msgs = null;
 			if (point != null)
-				msgs = ((InternalEObject) point).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.ELLIPTICAL_ARC_TO__POINT, null,
-						msgs);
+				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__POINT, null, msgs);
 			if (newPoint != null)
-				msgs = ((InternalEObject) newPoint).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.ELLIPTICAL_ARC_TO__POINT, null,
-						msgs);
+				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__POINT, null, msgs);
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.ELLIPTICAL_ARC_TO__POINT, newPoint, newPoint));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__POINT, newPoint, newPoint));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-			return basicSetRadii(null, msgs);
-		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-			return basicSetPoint(null, msgs);
+			case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+				return basicSetRadii(null, msgs);
+			case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+				return basicSetPoint(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-			return getRadii();
-		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
-			return getRotation();
-		case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
-			return isLargeArc();
-		case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
-			return isSweep();
-		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-			return getPoint();
+			case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+				return getRadii();
+			case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
+				return getRotation();
+			case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
+				return isLargeArc();
+			case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
+				return isSweep();
+			case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+				return getPoint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-			setRadii((Dimension) newValue);
-			return;
-		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
-			setRotation((Double) newValue);
-			return;
-		case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
-			setIsLargeArc((Boolean) newValue);
-			return;
-		case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
-			setIsSweep((Boolean) newValue);
-			return;
-		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-			setPoint((Point) newValue);
-			return;
+			case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+				setRadii((Dimension)newValue);
+				return;
+			case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
+				setRotation((Double)newValue);
+				return;
+			case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
+				setIsLargeArc((Boolean)newValue);
+				return;
+			case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
+				setIsSweep((Boolean)newValue);
+				return;
+			case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+				setPoint((Point)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-			setRadii((Dimension) null);
-			return;
-		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
-			setRotation(ROTATION_EDEFAULT);
-			return;
-		case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
-			setIsLargeArc(IS_LARGE_ARC_EDEFAULT);
-			return;
-		case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
-			setIsSweep(IS_SWEEP_EDEFAULT);
-			return;
-		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-			setPoint((Point) null);
-			return;
+			case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+				setRadii((Dimension)null);
+				return;
+			case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
+				setRotation(ROTATION_EDEFAULT);
+				return;
+			case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
+				setIsLargeArc(IS_LARGE_ARC_EDEFAULT);
+				return;
+			case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
+				setIsSweep(IS_SWEEP_EDEFAULT);
+				return;
+			case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+				setPoint((Point)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-			return radii != null;
-		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
-			return rotation != ROTATION_EDEFAULT;
-		case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
-			return isLargeArc != IS_LARGE_ARC_EDEFAULT;
-		case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
-			return isSweep != IS_SWEEP_EDEFAULT;
-		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-			return point != null;
+			case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+				return radii != null;
+			case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
+				return rotation != ROTATION_EDEFAULT;
+			case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
+				return isLargeArc != IS_LARGE_ARC_EDEFAULT;
+			case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
+				return isSweep != IS_SWEEP_EDEFAULT;
+			case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+				return point != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (rotation: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java
index 2d929f7299c..353f8df6168 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java
@@ -28,18 +28,16 @@ import org.eclipse.papyrus.dd.dg.GradientStop;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientImpl#getStops <em>Stop
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientImpl#getStops <em>Stop</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 	/**
-	 * The cached value of the '{@link #getStops() <em>Stop</em>}' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getStops() <em>Stop</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getStops()
 	 * @generated
 	 * @ordered
@@ -48,7 +46,6 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected GradientImpl() {
@@ -57,7 +54,6 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,88 +63,81 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<GradientStop> getStops() {
 		if (stops == null) {
-			stops = new EObjectContainmentEList<GradientStop>(
-					GradientStop.class, this, DGPackage.GRADIENT__STOP);
+			stops = new EObjectContainmentEList<GradientStop>(GradientStop.class, this, DGPackage.GRADIENT__STOP);
 		}
 		return stops;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.GRADIENT__STOP:
-			return ((InternalEList<?>) getStops()).basicRemove(otherEnd, msgs);
+			case DGPackage.GRADIENT__STOP:
+				return ((InternalEList<?>)getStops()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.GRADIENT__STOP:
-			return getStops();
+			case DGPackage.GRADIENT__STOP:
+				return getStops();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.GRADIENT__STOP:
-			getStops().clear();
-			getStops().addAll((Collection<? extends GradientStop>) newValue);
-			return;
+			case DGPackage.GRADIENT__STOP:
+				getStops().clear();
+				getStops().addAll((Collection<? extends GradientStop>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.GRADIENT__STOP:
-			getStops().clear();
-			return;
+			case DGPackage.GRADIENT__STOP:
+				getStops().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.GRADIENT__STOP:
-			return stops != null && !stops.isEmpty();
+			case DGPackage.GRADIENT__STOP:
+				return stops != null && !stops.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java
index a80f8c9e7b7..c14b62e8ece 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java
@@ -39,15 +39,12 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl#getColor <em>Color
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl#getOffset <em>
- * Offset</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl#getOpacity <em>
- * Opacity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl#getColor <em>Color</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl#getOffset <em>Offset</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl#getOpacity <em>Opacity</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GradientStopImpl extends MinimalEObjectImpl.Container implements
@@ -55,7 +52,6 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The default value of the '{@link #getColor() <em>Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getColor()
 	 * @generated
 	 * @ordered
@@ -65,7 +61,6 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getColor() <em>Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getColor()
 	 * @generated
 	 * @ordered
@@ -73,18 +68,17 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	protected Color color = COLOR_EDEFAULT;
 
 	/**
-	 * This is true if the Color attribute has been set. <!-- begin-user-doc -->
+	 * This is true if the Color attribute has been set.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean colorESet;
 
 	/**
-	 * The default value of the '{@link #getOffset() <em>Offset</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getOffset() <em>Offset</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getOffset()
 	 * @generated
 	 * @ordered
@@ -94,7 +88,6 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getOffset() <em>Offset</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getOffset()
 	 * @generated
 	 * @ordered
@@ -102,18 +95,17 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	protected double offset = OFFSET_EDEFAULT;
 
 	/**
-	 * This is true if the Offset attribute has been set. <!-- begin-user-doc
+	 * This is true if the Offset attribute has been set.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean offsetESet;
 
 	/**
-	 * The default value of the '{@link #getOpacity() <em>Opacity</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getOpacity() <em>Opacity</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getOpacity()
 	 * @generated
 	 * @ordered
@@ -121,9 +113,8 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	protected static final double OPACITY_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getOpacity() <em>Opacity</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getOpacity() <em>Opacity</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getOpacity()
 	 * @generated
 	 * @ordered
@@ -131,9 +122,9 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	protected double opacity = OPACITY_EDEFAULT;
 
 	/**
-	 * This is true if the Opacity attribute has been set. <!-- begin-user-doc
+	 * This is true if the Opacity attribute has been set.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -141,7 +132,6 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected GradientStopImpl() {
@@ -150,7 +140,6 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -160,7 +149,6 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Color getColor() {
@@ -169,7 +157,6 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setColor(Color newColor) {
@@ -178,14 +165,11 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 		boolean oldColorESet = colorESet;
 		colorESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.GRADIENT_STOP__COLOR, oldColor, color,
-					!oldColorESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRADIENT_STOP__COLOR, oldColor, color, !oldColorESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetColor() {
@@ -194,14 +178,11 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 		color = COLOR_EDEFAULT;
 		colorESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.GRADIENT_STOP__COLOR, oldColor, COLOR_EDEFAULT,
-					oldColorESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.GRADIENT_STOP__COLOR, oldColor, COLOR_EDEFAULT, oldColorESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetColor() {
@@ -210,7 +191,6 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getOffset() {
@@ -219,7 +199,6 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setOffset(double newOffset) {
@@ -228,14 +207,11 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 		boolean oldOffsetESet = offsetESet;
 		offsetESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.GRADIENT_STOP__OFFSET, oldOffset, offset,
-					!oldOffsetESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRADIENT_STOP__OFFSET, oldOffset, offset, !oldOffsetESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetOffset() {
@@ -244,14 +220,11 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 		offset = OFFSET_EDEFAULT;
 		offsetESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.GRADIENT_STOP__OFFSET, oldOffset,
-					OFFSET_EDEFAULT, oldOffsetESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.GRADIENT_STOP__OFFSET, oldOffset, OFFSET_EDEFAULT, oldOffsetESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetOffset() {
@@ -260,7 +233,6 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getOpacity() {
@@ -269,7 +241,6 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setOpacity(double newOpacity) {
@@ -278,14 +249,11 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 		boolean oldOpacityESet = opacityESet;
 		opacityESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.GRADIENT_STOP__OPACITY, oldOpacity, opacity,
-					!oldOpacityESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRADIENT_STOP__OPACITY, oldOpacity, opacity, !oldOpacityESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetOpacity() {
@@ -294,14 +262,11 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 		opacity = OPACITY_EDEFAULT;
 		opacityESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.GRADIENT_STOP__OPACITY, oldOpacity,
-					OPACITY_EDEFAULT, oldOpacityESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.GRADIENT_STOP__OPACITY, oldOpacity, OPACITY_EDEFAULT, oldOpacityESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetOpacity() {
@@ -309,13 +274,10 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Offset</em>}' invariant operation. <!-- begin-user-doc --> <!--
+	 * The cached validation expression for the '{@link #validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Offset</em>}' invariant operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @see #validOffset(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -323,32 +285,29 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validOffset(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.GRADIENT_STOP,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP,
-						VALID_OFFSET_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.GRADIENT_STOP__VALID_OFFSET);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.GRADIENT_STOP,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP,
+				 VALID_OFFSET_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.GRADIENT_STOP__VALID_OFFSET);
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Opacity</em>}' invariant operation. <!-- begin-user-doc -->
+	 * The cached validation expression for the '{@link #validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Opacity</em>}' invariant operation.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @see #validOpacity(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -356,105 +315,100 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validOpacity(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.GRADIENT_STOP,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP,
-						VALID_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.GRADIENT_STOP__VALID_OPACITY);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.GRADIENT_STOP,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP,
+				 VALID_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.GRADIENT_STOP__VALID_OPACITY);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.GRADIENT_STOP__COLOR:
-			return getColor();
-		case DGPackage.GRADIENT_STOP__OFFSET:
-			return getOffset();
-		case DGPackage.GRADIENT_STOP__OPACITY:
-			return getOpacity();
+			case DGPackage.GRADIENT_STOP__COLOR:
+				return getColor();
+			case DGPackage.GRADIENT_STOP__OFFSET:
+				return getOffset();
+			case DGPackage.GRADIENT_STOP__OPACITY:
+				return getOpacity();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.GRADIENT_STOP__COLOR:
-			setColor((Color) newValue);
-			return;
-		case DGPackage.GRADIENT_STOP__OFFSET:
-			setOffset((Double) newValue);
-			return;
-		case DGPackage.GRADIENT_STOP__OPACITY:
-			setOpacity((Double) newValue);
-			return;
+			case DGPackage.GRADIENT_STOP__COLOR:
+				setColor((Color)newValue);
+				return;
+			case DGPackage.GRADIENT_STOP__OFFSET:
+				setOffset((Double)newValue);
+				return;
+			case DGPackage.GRADIENT_STOP__OPACITY:
+				setOpacity((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.GRADIENT_STOP__COLOR:
-			unsetColor();
-			return;
-		case DGPackage.GRADIENT_STOP__OFFSET:
-			unsetOffset();
-			return;
-		case DGPackage.GRADIENT_STOP__OPACITY:
-			unsetOpacity();
-			return;
+			case DGPackage.GRADIENT_STOP__COLOR:
+				unsetColor();
+				return;
+			case DGPackage.GRADIENT_STOP__OFFSET:
+				unsetOffset();
+				return;
+			case DGPackage.GRADIENT_STOP__OPACITY:
+				unsetOpacity();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.GRADIENT_STOP__COLOR:
-			return isSetColor();
-		case DGPackage.GRADIENT_STOP__OFFSET:
-			return isSetOffset();
-		case DGPackage.GRADIENT_STOP__OPACITY:
-			return isSetOpacity();
+			case DGPackage.GRADIENT_STOP__COLOR:
+				return isSetColor();
+			case DGPackage.GRADIENT_STOP__OFFSET:
+				return isSetOffset();
+			case DGPackage.GRADIENT_STOP__OPACITY:
+				return isSetOpacity();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -462,42 +416,29 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP:
-			return validOffset((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
-		case DGPackage.GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP:
-			return validOpacity((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP:
+				return validOffset((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+			case DGPackage.GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP:
+				return validOpacity((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (color: ");
-		if (colorESet)
-			result.append(color);
-		else
-			result.append("<unset>");
+		if (colorESet) result.append(color); else result.append("<unset>");
 		result.append(", offset: ");
-		if (offsetESet)
-			result.append(offset);
-		else
-			result.append("<unset>");
+		if (offsetESet) result.append(offset); else result.append("<unset>");
 		result.append(", opacity: ");
-		if (opacityESet)
-			result.append(opacity);
-		else
-			result.append("<unset>");
+		if (opacityESet) result.append(opacity); else result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java
index 79583e6f7a6..3caa2723f71 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java
@@ -40,27 +40,22 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getClipPath
- * <em>Clip Path</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getGroup <em>
- * Group</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getClasses
- * <em>Class</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getStyle <em>
- * Style</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getTransforms
- * <em>Transform</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getClipPath <em>Clip Path</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getGroup <em>Group</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getClasses <em>Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getStyle <em>Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getTransforms <em>Transform</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getLayoutData <em>Layout Data</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class GraphicalElementImpl extends DefinitionImpl implements
 		GraphicalElement {
 	/**
-	 * The cached value of the '{@link #getClipPath() <em>Clip Path</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getClipPath() <em>Clip Path</em>}' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getClipPath()
 	 * @generated
 	 * @ordered
@@ -68,9 +63,8 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 	protected ClipPath clipPath;
 
 	/**
-	 * The cached value of the '{@link #getClasses() <em>Class</em>}' attribute
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getClasses() <em>Class</em>}' attribute list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getClasses()
 	 * @generated
 	 * @ordered
@@ -78,9 +72,8 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 	protected EList<String> classes;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -88,9 +81,8 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 	protected Style style;
 
 	/**
-	 * The cached value of the '{@link #getTransforms() <em>Transform</em>}'
-	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getTransforms() <em>Transform</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getTransforms()
 	 * @generated
 	 * @ordered
@@ -98,8 +90,27 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 	protected EList<Transform> transforms;
 
 	/**
+	 * The default value of the '{@link #getLayoutData() <em>Layout Data</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLayoutData()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LAYOUT_DATA_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getLayoutData() <em>Layout Data</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLayoutData()
+	 * @generated
+	 * @ordered
+	 */
+	protected String layoutData = LAYOUT_DATA_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected GraphicalElementImpl() {
@@ -108,7 +119,6 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -118,18 +128,15 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public ClipPath getClipPath() {
 		if (clipPath != null && clipPath.eIsProxy()) {
-			InternalEObject oldClipPath = (InternalEObject) clipPath;
-			clipPath = (ClipPath) eResolveProxy(oldClipPath);
+			InternalEObject oldClipPath = (InternalEObject)clipPath;
+			clipPath = (ClipPath)eResolveProxy(oldClipPath);
 			if (clipPath != oldClipPath) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH,
-							oldClipPath, clipPath));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH, oldClipPath, clipPath));
 			}
 		}
 		return clipPath;
@@ -137,7 +144,6 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public ClipPath basicGetClipPath() {
@@ -146,82 +152,67 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setClipPath(ClipPath newClipPath) {
 		ClipPath oldClipPath = clipPath;
 		clipPath = newClipPath;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH, oldClipPath,
-					clipPath));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH, oldClipPath, clipPath));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Group getGroup() {
-		if (eContainerFeatureID() != DGPackage.GRAPHICAL_ELEMENT__GROUP)
-			return null;
-		return (Group) eInternalContainer();
+		if (eContainerFeatureID() != DGPackage.GRAPHICAL_ELEMENT__GROUP) return null;
+		return (Group)eInternalContainer();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetGroup(Group newGroup,
 			NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject) newGroup,
-				DGPackage.GRAPHICAL_ELEMENT__GROUP, msgs);
+		msgs = eBasicSetContainer((InternalEObject)newGroup, DGPackage.GRAPHICAL_ELEMENT__GROUP, msgs);
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setGroup(Group newGroup) {
-		if (newGroup != eInternalContainer()
-				|| (eContainerFeatureID() != DGPackage.GRAPHICAL_ELEMENT__GROUP && newGroup != null)) {
+		if (newGroup != eInternalContainer() || (eContainerFeatureID() != DGPackage.GRAPHICAL_ELEMENT__GROUP && newGroup != null)) {
 			if (EcoreUtil.isAncestor(this, newGroup))
-				throw new IllegalArgumentException(
-						"Recursive containment not allowed for " + toString());
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
 			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
 			if (newGroup != null)
-				msgs = ((InternalEObject) newGroup).eInverseAdd(this,
-						DGPackage.GROUP__MEMBER, Group.class, msgs);
+				msgs = ((InternalEObject)newGroup).eInverseAdd(this, DGPackage.GROUP__MEMBER, Group.class, msgs);
 			msgs = basicSetGroup(newGroup, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.GRAPHICAL_ELEMENT__GROUP, newGroup, newGroup));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__GROUP, newGroup, newGroup));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<String> getClasses() {
 		if (classes == null) {
-			classes = new EDataTypeUniqueEList<String>(String.class, this,
-					DGPackage.GRAPHICAL_ELEMENT__CLASS);
+			classes = new EDataTypeUniqueEList<String>(String.class, this, DGPackage.GRAPHICAL_ELEMENT__CLASS);
 		}
 		return classes;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Style getStyle() {
@@ -230,7 +221,6 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetStyle(Style newStyle,
@@ -238,58 +228,63 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 		Style oldStyle = style;
 		style = newStyle;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.GRAPHICAL_ELEMENT__STYLE,
-					oldStyle, newStyle);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__STYLE, oldStyle, newStyle);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setStyle(Style newStyle) {
 		if (newStyle != style) {
 			NotificationChain msgs = null;
 			if (style != null)
-				msgs = ((InternalEObject) style).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.GRAPHICAL_ELEMENT__STYLE, null,
-						msgs);
+				msgs = ((InternalEObject)style).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.GRAPHICAL_ELEMENT__STYLE, null, msgs);
 			if (newStyle != null)
-				msgs = ((InternalEObject) newStyle).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.GRAPHICAL_ELEMENT__STYLE, null,
-						msgs);
+				msgs = ((InternalEObject)newStyle).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.GRAPHICAL_ELEMENT__STYLE, null, msgs);
 			msgs = basicSetStyle(newStyle, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.GRAPHICAL_ELEMENT__STYLE, newStyle, newStyle));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__STYLE, newStyle, newStyle));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<Transform> getTransforms() {
 		if (transforms == null) {
-			transforms = new EObjectContainmentEList<Transform>(
-					Transform.class, this,
-					DGPackage.GRAPHICAL_ELEMENT__TRANSFORM);
+			transforms = new EObjectContainmentEList<Transform>(Transform.class, this, DGPackage.GRAPHICAL_ELEMENT__TRANSFORM);
 		}
 		return transforms;
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLayoutData() {
+		return layoutData;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLayoutData(String newLayoutData) {
+		String oldLayoutData = layoutData;
+		layoutData = newLayoutData;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA, oldLayoutData, layoutData));
+	}
+
+	/**
 	 * The cached validation expression for the '
 	 * {@link #referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced Clippath Has Id</em>}' invariant operation. <!--
@@ -304,184 +299,182 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean referencedClippathHasId(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.GRAPHICAL_ELEMENT,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP,
-						REFERENCED_CLIPPATH_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR,
-						DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.GRAPHICAL_ELEMENT__REFERENCED_CLIPPATH_HAS_ID);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.GRAPHICAL_ELEMENT,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP,
+				 REFERENCED_CLIPPATH_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.GRAPHICAL_ELEMENT__REFERENCED_CLIPPATH_HAS_ID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			return basicSetGroup((Group) otherEnd, msgs);
+			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetGroup((Group)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-			return basicSetGroup(null, msgs);
-		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-			return basicSetStyle(null, msgs);
-		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-			return ((InternalEList<?>) getTransforms()).basicRemove(otherEnd,
-					msgs);
+			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+				return basicSetGroup(null, msgs);
+			case DGPackage.GRAPHICAL_ELEMENT__STYLE:
+				return basicSetStyle(null, msgs);
+			case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+				return ((InternalEList<?>)getTransforms()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(
 			NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
-		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-			return eInternalContainer().eInverseRemove(this,
-					DGPackage.GROUP__MEMBER, Group.class, msgs);
+			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+				return eInternalContainer().eInverseRemove(this, DGPackage.GROUP__MEMBER, Group.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
-			if (resolve)
-				return getClipPath();
-			return basicGetClipPath();
-		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-			return getGroup();
-		case DGPackage.GRAPHICAL_ELEMENT__CLASS:
-			return getClasses();
-		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-			return getStyle();
-		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-			return getTransforms();
+			case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
+				if (resolve) return getClipPath();
+				return basicGetClipPath();
+			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+				return getGroup();
+			case DGPackage.GRAPHICAL_ELEMENT__CLASS:
+				return getClasses();
+			case DGPackage.GRAPHICAL_ELEMENT__STYLE:
+				return getStyle();
+			case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+				return getTransforms();
+			case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
+				return getLayoutData();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
-			setClipPath((ClipPath) newValue);
-			return;
-		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-			setGroup((Group) newValue);
-			return;
-		case DGPackage.GRAPHICAL_ELEMENT__CLASS:
-			getClasses().clear();
-			getClasses().addAll((Collection<? extends String>) newValue);
-			return;
-		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-			setStyle((Style) newValue);
-			return;
-		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-			getTransforms().clear();
-			getTransforms().addAll((Collection<? extends Transform>) newValue);
-			return;
+			case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
+				setClipPath((ClipPath)newValue);
+				return;
+			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+				setGroup((Group)newValue);
+				return;
+			case DGPackage.GRAPHICAL_ELEMENT__CLASS:
+				getClasses().clear();
+				getClasses().addAll((Collection<? extends String>)newValue);
+				return;
+			case DGPackage.GRAPHICAL_ELEMENT__STYLE:
+				setStyle((Style)newValue);
+				return;
+			case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+				getTransforms().clear();
+				getTransforms().addAll((Collection<? extends Transform>)newValue);
+				return;
+			case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
+				setLayoutData((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
-			setClipPath((ClipPath) null);
-			return;
-		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-			setGroup((Group) null);
-			return;
-		case DGPackage.GRAPHICAL_ELEMENT__CLASS:
-			getClasses().clear();
-			return;
-		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-			setStyle((Style) null);
-			return;
-		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-			getTransforms().clear();
-			return;
+			case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
+				setClipPath((ClipPath)null);
+				return;
+			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+				setGroup((Group)null);
+				return;
+			case DGPackage.GRAPHICAL_ELEMENT__CLASS:
+				getClasses().clear();
+				return;
+			case DGPackage.GRAPHICAL_ELEMENT__STYLE:
+				setStyle((Style)null);
+				return;
+			case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+				getTransforms().clear();
+				return;
+			case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
+				setLayoutData(LAYOUT_DATA_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
-			return clipPath != null;
-		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-			return getGroup() != null;
-		case DGPackage.GRAPHICAL_ELEMENT__CLASS:
-			return classes != null && !classes.isEmpty();
-		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-			return style != null;
-		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-			return transforms != null && !transforms.isEmpty();
+			case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
+				return clipPath != null;
+			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+				return getGroup() != null;
+			case DGPackage.GRAPHICAL_ELEMENT__CLASS:
+				return classes != null && !classes.isEmpty();
+			case DGPackage.GRAPHICAL_ELEMENT__STYLE:
+				return style != null;
+			case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+				return transforms != null && !transforms.isEmpty();
+			case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
+				return LAYOUT_DATA_EDEFAULT == null ? layoutData != null : !LAYOUT_DATA_EDEFAULT.equals(layoutData);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -489,26 +482,25 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP:
-			return referencedClippathHasId((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP:
+				return referencedClippathHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (class: ");
 		result.append(classes);
+		result.append(", layoutData: ");
+		result.append(layoutData);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java
index ca7ac6928ba..4755db93311 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java
@@ -13,6 +13,7 @@ package org.eclipse.papyrus.dd.dg.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;
@@ -20,6 +21,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.util.EObjectContainmentWithInverseEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
@@ -33,18 +35,17 @@ import org.eclipse.papyrus.dd.dg.Group;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl#getMembers <em>Member
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl#getMembers <em>Member</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl#getLayout <em>Layout</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class GroupImpl extends GraphicalElementImpl implements Group {
 	/**
-	 * The cached value of the '{@link #getMembers() <em>Member</em>}'
-	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getMembers() <em>Member</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getMembers()
 	 * @generated
 	 * @ordered
@@ -52,8 +53,26 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	protected EList<GraphicalElement> members;
 
 	/**
+	 * The default value of the '{@link #getLayout() <em>Layout</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLayout()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String LAYOUT_EDEFAULT = null;
+	/**
+	 * The cached value of the '{@link #getLayout() <em>Layout</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLayout()
+	 * @generated
+	 * @ordered
+	 */
+	protected String layout = LAYOUT_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected GroupImpl() {
@@ -62,7 +81,6 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -72,21 +90,38 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<GraphicalElement> getMembers() {
 		if (members == null) {
-			members = new EObjectContainmentWithInverseEList<GraphicalElement>(
-					GraphicalElement.class, this, DGPackage.GROUP__MEMBER,
-					DGPackage.GRAPHICAL_ELEMENT__GROUP);
+			members = new EObjectContainmentWithInverseEList<GraphicalElement>(GraphicalElement.class, this, DGPackage.GROUP__MEMBER, DGPackage.GRAPHICAL_ELEMENT__GROUP);
 		}
 		return members;
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLayout() {
+		return layout;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLayout(String newLayout) {
+		String oldLayout = layout;
+		layout = newLayout;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GROUP__LAYOUT, oldLayout, layout));
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -94,88 +129,106 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	public NotificationChain eInverseAdd(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.GROUP__MEMBER:
-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getMembers())
-					.basicAdd(otherEnd, msgs);
+			case DGPackage.GROUP__MEMBER:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getMembers()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.GROUP__MEMBER:
-			return ((InternalEList<?>) getMembers())
-					.basicRemove(otherEnd, msgs);
+			case DGPackage.GROUP__MEMBER:
+				return ((InternalEList<?>)getMembers()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.GROUP__MEMBER:
-			return getMembers();
+			case DGPackage.GROUP__MEMBER:
+				return getMembers();
+			case DGPackage.GROUP__LAYOUT:
+				return getLayout();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.GROUP__MEMBER:
-			getMembers().clear();
-			getMembers().addAll(
-					(Collection<? extends GraphicalElement>) newValue);
-			return;
+			case DGPackage.GROUP__MEMBER:
+				getMembers().clear();
+				getMembers().addAll((Collection<? extends GraphicalElement>)newValue);
+				return;
+			case DGPackage.GROUP__LAYOUT:
+				setLayout((String)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.GROUP__MEMBER:
-			getMembers().clear();
-			return;
+			case DGPackage.GROUP__MEMBER:
+				getMembers().clear();
+				return;
+			case DGPackage.GROUP__LAYOUT:
+				setLayout(LAYOUT_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.GROUP__MEMBER:
-			return members != null && !members.isEmpty();
+			case DGPackage.GROUP__MEMBER:
+				return members != null && !members.isEmpty();
+			case DGPackage.GROUP__LAYOUT:
+				return LAYOUT_EDEFAULT == null ? layout != null : !LAYOUT_EDEFAULT.equals(layout);
 		}
 		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(" (layout: ");
+		result.append(layout);
+		result.append(')');
+		return result.toString();
+	}
+
 } // GroupImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java
index e5315f39819..6a96621ee0d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java
@@ -36,22 +36,18 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl#getSource <em>Source
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl#getBounds <em>Bounds
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl#isAspectRatioPreserved
- * <em>Is Aspect Ratio Preserved</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl#getSource <em>Source</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl#getBounds <em>Bounds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl#isAspectRatioPreserved <em>Is Aspect Ratio Preserved</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ImageImpl extends GraphicalElementImpl implements Image {
 	/**
-	 * The default value of the '{@link #getSource() <em>Source</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getSource() <em>Source</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getSource()
 	 * @generated
 	 * @ordered
@@ -61,7 +57,6 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	/**
 	 * The cached value of the '{@link #getSource() <em>Source</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getSource()
 	 * @generated
 	 * @ordered
@@ -69,9 +64,8 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	protected String source = SOURCE_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -79,10 +73,9 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	protected Bounds bounds;
 
 	/**
-	 * The default value of the '{@link #isAspectRatioPreserved()
-	 * <em>Is Aspect Ratio Preserved</em>}' attribute. <!-- begin-user-doc -->
+	 * The default value of the '{@link #isAspectRatioPreserved() <em>Is Aspect Ratio Preserved</em>}' attribute.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #isAspectRatioPreserved()
 	 * @generated
 	 * @ordered
@@ -90,10 +83,9 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	protected static final boolean IS_ASPECT_RATIO_PRESERVED_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isAspectRatioPreserved()
-	 * <em>Is Aspect Ratio Preserved</em>}' attribute. <!-- begin-user-doc -->
+	 * The cached value of the '{@link #isAspectRatioPreserved() <em>Is Aspect Ratio Preserved</em>}' attribute.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #isAspectRatioPreserved()
 	 * @generated
 	 * @ordered
@@ -102,7 +94,6 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected ImageImpl() {
@@ -111,7 +102,6 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -121,7 +111,6 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getSource() {
@@ -130,20 +119,17 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setSource(String newSource) {
 		String oldSource = source;
 		source = newSource;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.IMAGE__SOURCE, oldSource, source));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.IMAGE__SOURCE, oldSource, source));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -152,7 +138,6 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBounds(Bounds newBounds,
@@ -160,44 +145,32 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.IMAGE__BOUNDS, oldBounds,
-					newBounds);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.IMAGE__BOUNDS, oldBounds, newBounds);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
 		if (newBounds != bounds) {
 			NotificationChain msgs = null;
 			if (bounds != null)
-				msgs = ((InternalEObject) bounds).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.IMAGE__BOUNDS, null,
-						msgs);
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.IMAGE__BOUNDS, null, msgs);
 			if (newBounds != null)
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.IMAGE__BOUNDS, null,
-						msgs);
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.IMAGE__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.IMAGE__BOUNDS, newBounds, newBounds));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.IMAGE__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isAspectRatioPreserved() {
@@ -206,16 +179,13 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setIsAspectRatioPreserved(boolean newIsAspectRatioPreserved) {
 		boolean oldIsAspectRatioPreserved = isAspectRatioPreserved;
 		isAspectRatioPreserved = newIsAspectRatioPreserved;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED,
-					oldIsAspectRatioPreserved, isAspectRatioPreserved));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED, oldIsAspectRatioPreserved, isAspectRatioPreserved));
 	}
 
 	/**
@@ -233,121 +203,114 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean sourceCannotBeEmpty(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.IMAGE,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP,
-						SOURCE_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.IMAGE__SOURCE_CANNOT_BE_EMPTY);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.IMAGE,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP,
+				 SOURCE_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.IMAGE__SOURCE_CANNOT_BE_EMPTY);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.IMAGE__BOUNDS:
-			return basicSetBounds(null, msgs);
+			case DGPackage.IMAGE__BOUNDS:
+				return basicSetBounds(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.IMAGE__SOURCE:
-			return getSource();
-		case DGPackage.IMAGE__BOUNDS:
-			return getBounds();
-		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
-			return isAspectRatioPreserved();
+			case DGPackage.IMAGE__SOURCE:
+				return getSource();
+			case DGPackage.IMAGE__BOUNDS:
+				return getBounds();
+			case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
+				return isAspectRatioPreserved();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.IMAGE__SOURCE:
-			setSource((String) newValue);
-			return;
-		case DGPackage.IMAGE__BOUNDS:
-			setBounds((Bounds) newValue);
-			return;
-		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
-			setIsAspectRatioPreserved((Boolean) newValue);
-			return;
+			case DGPackage.IMAGE__SOURCE:
+				setSource((String)newValue);
+				return;
+			case DGPackage.IMAGE__BOUNDS:
+				setBounds((Bounds)newValue);
+				return;
+			case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
+				setIsAspectRatioPreserved((Boolean)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.IMAGE__SOURCE:
-			setSource(SOURCE_EDEFAULT);
-			return;
-		case DGPackage.IMAGE__BOUNDS:
-			setBounds((Bounds) null);
-			return;
-		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
-			setIsAspectRatioPreserved(IS_ASPECT_RATIO_PRESERVED_EDEFAULT);
-			return;
+			case DGPackage.IMAGE__SOURCE:
+				setSource(SOURCE_EDEFAULT);
+				return;
+			case DGPackage.IMAGE__BOUNDS:
+				setBounds((Bounds)null);
+				return;
+			case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
+				setIsAspectRatioPreserved(IS_ASPECT_RATIO_PRESERVED_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.IMAGE__SOURCE:
-			return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT
-					.equals(source);
-		case DGPackage.IMAGE__BOUNDS:
-			return bounds != null;
-		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
-			return isAspectRatioPreserved != IS_ASPECT_RATIO_PRESERVED_EDEFAULT;
+			case DGPackage.IMAGE__SOURCE:
+				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
+			case DGPackage.IMAGE__BOUNDS:
+				return bounds != null;
+			case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
+				return isAspectRatioPreserved != IS_ASPECT_RATIO_PRESERVED_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -355,22 +318,19 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
-			return sourceCannotBeEmpty((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
+				return sourceCannotBeEmpty((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (source: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java
index 0f8931de7eb..229f39924a8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java
@@ -30,18 +30,17 @@ import org.eclipse.papyrus.dd.dg.Line;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.LineImpl#getStart <em>Start</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.LineImpl#getEnd <em>End</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.LineImpl#getStart <em>Start</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.LineImpl#getEnd <em>End</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class LineImpl extends MarkedElementImpl implements Line {
 	/**
-	 * The cached value of the '{@link #getStart() <em>Start</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getStart() <em>Start</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getStart()
 	 * @generated
 	 * @ordered
@@ -49,9 +48,8 @@ public class LineImpl extends MarkedElementImpl implements Line {
 	protected Point start;
 
 	/**
-	 * The cached value of the '{@link #getEnd() <em>End</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getEnd() <em>End</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getEnd()
 	 * @generated
 	 * @ordered
@@ -60,7 +58,6 @@ public class LineImpl extends MarkedElementImpl implements Line {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected LineImpl() {
@@ -69,7 +66,6 @@ public class LineImpl extends MarkedElementImpl implements Line {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -79,7 +75,6 @@ public class LineImpl extends MarkedElementImpl implements Line {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getStart() {
@@ -88,7 +83,6 @@ public class LineImpl extends MarkedElementImpl implements Line {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetStart(Point newStart,
@@ -96,43 +90,32 @@ public class LineImpl extends MarkedElementImpl implements Line {
 		Point oldStart = start;
 		start = newStart;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.LINE__START, oldStart, newStart);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINE__START, oldStart, newStart);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setStart(Point newStart) {
 		if (newStart != start) {
 			NotificationChain msgs = null;
 			if (start != null)
-				msgs = ((InternalEObject) start).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.LINE__START, null,
-						msgs);
+				msgs = ((InternalEObject)start).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__START, null, msgs);
 			if (newStart != null)
-				msgs = ((InternalEObject) newStart).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.LINE__START, null,
-						msgs);
+				msgs = ((InternalEObject)newStart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__START, null, msgs);
 			msgs = basicSetStart(newStart, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.LINE__START, newStart, newStart));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINE__START, newStart, newStart));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getEnd() {
@@ -141,128 +124,112 @@ public class LineImpl extends MarkedElementImpl implements Line {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetEnd(Point newEnd, NotificationChain msgs) {
 		Point oldEnd = end;
 		end = newEnd;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.LINE__END, oldEnd, newEnd);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINE__END, oldEnd, newEnd);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setEnd(Point newEnd) {
 		if (newEnd != end) {
 			NotificationChain msgs = null;
 			if (end != null)
-				msgs = ((InternalEObject) end).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.LINE__END, null,
-						msgs);
+				msgs = ((InternalEObject)end).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__END, null, msgs);
 			if (newEnd != null)
-				msgs = ((InternalEObject) newEnd).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.LINE__END, null,
-						msgs);
+				msgs = ((InternalEObject)newEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__END, null, msgs);
 			msgs = basicSetEnd(newEnd, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.LINE__END, newEnd, newEnd));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINE__END, newEnd, newEnd));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.LINE__START:
-			return basicSetStart(null, msgs);
-		case DGPackage.LINE__END:
-			return basicSetEnd(null, msgs);
+			case DGPackage.LINE__START:
+				return basicSetStart(null, msgs);
+			case DGPackage.LINE__END:
+				return basicSetEnd(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.LINE__START:
-			return getStart();
-		case DGPackage.LINE__END:
-			return getEnd();
+			case DGPackage.LINE__START:
+				return getStart();
+			case DGPackage.LINE__END:
+				return getEnd();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.LINE__START:
-			setStart((Point) newValue);
-			return;
-		case DGPackage.LINE__END:
-			setEnd((Point) newValue);
-			return;
+			case DGPackage.LINE__START:
+				setStart((Point)newValue);
+				return;
+			case DGPackage.LINE__END:
+				setEnd((Point)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.LINE__START:
-			setStart((Point) null);
-			return;
-		case DGPackage.LINE__END:
-			setEnd((Point) null);
-			return;
+			case DGPackage.LINE__START:
+				setStart((Point)null);
+				return;
+			case DGPackage.LINE__END:
+				setEnd((Point)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.LINE__START:
-			return start != null;
-		case DGPackage.LINE__END:
-			return end != null;
+			case DGPackage.LINE__START:
+				return start != null;
+			case DGPackage.LINE__END:
+				return end != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java
index 21318835354..9194837e80d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java
@@ -30,18 +30,16 @@ import org.eclipse.papyrus.dd.dg.LineTo;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.LineToImpl#getPoint <em>Point</em>}
- * </li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.LineToImpl#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class LineToImpl extends PathCommandImpl implements LineTo {
 	/**
-	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getPoint()
 	 * @generated
 	 * @ordered
@@ -50,7 +48,6 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected LineToImpl() {
@@ -59,7 +56,6 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -69,7 +65,6 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getPoint() {
@@ -78,7 +73,6 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetPoint(Point newPoint,
@@ -86,110 +80,94 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 		Point oldPoint = point;
 		point = newPoint;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.LINE_TO__POINT, oldPoint,
-					newPoint);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINE_TO__POINT, oldPoint, newPoint);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setPoint(Point newPoint) {
 		if (newPoint != point) {
 			NotificationChain msgs = null;
 			if (point != null)
-				msgs = ((InternalEObject) point).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.LINE_TO__POINT,
-						null, msgs);
+				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE_TO__POINT, null, msgs);
 			if (newPoint != null)
-				msgs = ((InternalEObject) newPoint).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.LINE_TO__POINT,
-						null, msgs);
+				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE_TO__POINT, null, msgs);
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.LINE_TO__POINT, newPoint, newPoint));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINE_TO__POINT, newPoint, newPoint));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.LINE_TO__POINT:
-			return basicSetPoint(null, msgs);
+			case DGPackage.LINE_TO__POINT:
+				return basicSetPoint(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.LINE_TO__POINT:
-			return getPoint();
+			case DGPackage.LINE_TO__POINT:
+				return getPoint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.LINE_TO__POINT:
-			setPoint((Point) newValue);
-			return;
+			case DGPackage.LINE_TO__POINT:
+				setPoint((Point)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.LINE_TO__POINT:
-			setPoint((Point) null);
-			return;
+			case DGPackage.LINE_TO__POINT:
+				setPoint((Point)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.LINE_TO__POINT:
-			return point != null;
+			case DGPackage.LINE_TO__POINT:
+				return point != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java
index c3cf95520c2..68c03105a5c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java
@@ -39,20 +39,17 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl#getStart <em>
- * Start</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl#getEnd <em>End
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl#getStart <em>Start</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl#getEnd <em>End</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	/**
-	 * The cached value of the '{@link #getStart() <em>Start</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getStart() <em>Start</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getStart()
 	 * @generated
 	 * @ordered
@@ -60,9 +57,8 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	protected Point start;
 
 	/**
-	 * The cached value of the '{@link #getEnd() <em>End</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getEnd() <em>End</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getEnd()
 	 * @generated
 	 * @ordered
@@ -71,7 +67,6 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected LinearGradientImpl() {
@@ -80,7 +75,6 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -90,7 +84,6 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getStart() {
@@ -99,7 +92,6 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetStart(Point newStart,
@@ -107,44 +99,32 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 		Point oldStart = start;
 		start = newStart;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.LINEAR_GRADIENT__START,
-					oldStart, newStart);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINEAR_GRADIENT__START, oldStart, newStart);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setStart(Point newStart) {
 		if (newStart != start) {
 			NotificationChain msgs = null;
 			if (start != null)
-				msgs = ((InternalEObject) start).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.LINEAR_GRADIENT__START, null, msgs);
+				msgs = ((InternalEObject)start).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__START, null, msgs);
 			if (newStart != null)
-				msgs = ((InternalEObject) newStart).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.LINEAR_GRADIENT__START, null, msgs);
+				msgs = ((InternalEObject)newStart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__START, null, msgs);
 			msgs = basicSetStart(newStart, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.LINEAR_GRADIENT__START, newStart, newStart));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINEAR_GRADIENT__START, newStart, newStart));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getEnd() {
@@ -153,56 +133,41 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetEnd(Point newEnd, NotificationChain msgs) {
 		Point oldEnd = end;
 		end = newEnd;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.LINEAR_GRADIENT__END, oldEnd,
-					newEnd);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINEAR_GRADIENT__END, oldEnd, newEnd);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setEnd(Point newEnd) {
 		if (newEnd != end) {
 			NotificationChain msgs = null;
 			if (end != null)
-				msgs = ((InternalEObject) end)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-								- DGPackage.LINEAR_GRADIENT__END, null, msgs);
+				msgs = ((InternalEObject)end).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__END, null, msgs);
 			if (newEnd != null)
-				msgs = ((InternalEObject) newEnd)
-						.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-								- DGPackage.LINEAR_GRADIENT__END, null, msgs);
+				msgs = ((InternalEObject)newEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__END, null, msgs);
 			msgs = basicSetEnd(newEnd, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.LINEAR_GRADIENT__END, newEnd, newEnd));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINEAR_GRADIENT__END, newEnd, newEnd));
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Gradient Vector</em>}' invariant operation. <!-- begin-user-doc
+	 * The cached validation expression for the '{@link #validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Gradient Vector</em>}' invariant operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #validGradientVector(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -210,112 +175,106 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validGradientVector(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.LINEAR_GRADIENT,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP,
-						VALID_GRADIENT_VECTOR_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.LINEAR_GRADIENT__VALID_GRADIENT_VECTOR);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.LINEAR_GRADIENT,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP,
+				 VALID_GRADIENT_VECTOR_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.LINEAR_GRADIENT__VALID_GRADIENT_VECTOR);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.LINEAR_GRADIENT__START:
-			return basicSetStart(null, msgs);
-		case DGPackage.LINEAR_GRADIENT__END:
-			return basicSetEnd(null, msgs);
+			case DGPackage.LINEAR_GRADIENT__START:
+				return basicSetStart(null, msgs);
+			case DGPackage.LINEAR_GRADIENT__END:
+				return basicSetEnd(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.LINEAR_GRADIENT__START:
-			return getStart();
-		case DGPackage.LINEAR_GRADIENT__END:
-			return getEnd();
+			case DGPackage.LINEAR_GRADIENT__START:
+				return getStart();
+			case DGPackage.LINEAR_GRADIENT__END:
+				return getEnd();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.LINEAR_GRADIENT__START:
-			setStart((Point) newValue);
-			return;
-		case DGPackage.LINEAR_GRADIENT__END:
-			setEnd((Point) newValue);
-			return;
+			case DGPackage.LINEAR_GRADIENT__START:
+				setStart((Point)newValue);
+				return;
+			case DGPackage.LINEAR_GRADIENT__END:
+				setEnd((Point)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.LINEAR_GRADIENT__START:
-			setStart((Point) null);
-			return;
-		case DGPackage.LINEAR_GRADIENT__END:
-			setEnd((Point) null);
-			return;
+			case DGPackage.LINEAR_GRADIENT__START:
+				setStart((Point)null);
+				return;
+			case DGPackage.LINEAR_GRADIENT__END:
+				setEnd((Point)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.LINEAR_GRADIENT__START:
-			return start != null;
-		case DGPackage.LINEAR_GRADIENT__END:
-			return end != null;
+			case DGPackage.LINEAR_GRADIENT__START:
+				return start != null;
+			case DGPackage.LINEAR_GRADIENT__END:
+				return end != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -323,9 +282,8 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP:
-			return validGradientVector((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP:
+				return validGradientVector((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java
index c1a5ae3f588..ac595fdf9ab 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java
@@ -34,23 +34,19 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl#getEndMarker <em>
- * End Marker</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl#getMidMarker <em>
- * Mid Marker</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl#getStartMarker
- * <em>Start Marker</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl#getEndMarker <em>End Marker</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl#getMidMarker <em>Mid Marker</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl#getStartMarker <em>Start Marker</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 		MarkedElement {
 	/**
-	 * The cached value of the '{@link #getEndMarker() <em>End Marker</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getEndMarker() <em>End Marker</em>}' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getEndMarker()
 	 * @generated
 	 * @ordered
@@ -58,9 +54,8 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	protected Marker endMarker;
 
 	/**
-	 * The cached value of the '{@link #getMidMarker() <em>Mid Marker</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getMidMarker() <em>Mid Marker</em>}' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getMidMarker()
 	 * @generated
 	 * @ordered
@@ -68,9 +63,8 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	protected Marker midMarker;
 
 	/**
-	 * The cached value of the '{@link #getStartMarker() <em>Start Marker</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getStartMarker() <em>Start Marker</em>}' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getStartMarker()
 	 * @generated
 	 * @ordered
@@ -79,7 +73,6 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected MarkedElementImpl() {
@@ -88,7 +81,6 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -98,18 +90,15 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Marker getEndMarker() {
 		if (endMarker != null && endMarker.eIsProxy()) {
-			InternalEObject oldEndMarker = (InternalEObject) endMarker;
-			endMarker = (Marker) eResolveProxy(oldEndMarker);
+			InternalEObject oldEndMarker = (InternalEObject)endMarker;
+			endMarker = (Marker)eResolveProxy(oldEndMarker);
 			if (endMarker != oldEndMarker) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							DGPackage.MARKED_ELEMENT__END_MARKER, oldEndMarker,
-							endMarker));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.MARKED_ELEMENT__END_MARKER, oldEndMarker, endMarker));
 			}
 		}
 		return endMarker;
@@ -117,7 +106,6 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Marker basicGetEndMarker() {
@@ -126,32 +114,26 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setEndMarker(Marker newEndMarker) {
 		Marker oldEndMarker = endMarker;
 		endMarker = newEndMarker;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.MARKED_ELEMENT__END_MARKER, oldEndMarker,
-					endMarker));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKED_ELEMENT__END_MARKER, oldEndMarker, endMarker));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Marker getMidMarker() {
 		if (midMarker != null && midMarker.eIsProxy()) {
-			InternalEObject oldMidMarker = (InternalEObject) midMarker;
-			midMarker = (Marker) eResolveProxy(oldMidMarker);
+			InternalEObject oldMidMarker = (InternalEObject)midMarker;
+			midMarker = (Marker)eResolveProxy(oldMidMarker);
 			if (midMarker != oldMidMarker) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							DGPackage.MARKED_ELEMENT__MID_MARKER, oldMidMarker,
-							midMarker));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.MARKED_ELEMENT__MID_MARKER, oldMidMarker, midMarker));
 			}
 		}
 		return midMarker;
@@ -159,7 +141,6 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Marker basicGetMidMarker() {
@@ -168,32 +149,26 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setMidMarker(Marker newMidMarker) {
 		Marker oldMidMarker = midMarker;
 		midMarker = newMidMarker;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.MARKED_ELEMENT__MID_MARKER, oldMidMarker,
-					midMarker));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKED_ELEMENT__MID_MARKER, oldMidMarker, midMarker));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Marker getStartMarker() {
 		if (startMarker != null && startMarker.eIsProxy()) {
-			InternalEObject oldStartMarker = (InternalEObject) startMarker;
-			startMarker = (Marker) eResolveProxy(oldStartMarker);
+			InternalEObject oldStartMarker = (InternalEObject)startMarker;
+			startMarker = (Marker)eResolveProxy(oldStartMarker);
 			if (startMarker != oldStartMarker) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							DGPackage.MARKED_ELEMENT__START_MARKER,
-							oldStartMarker, startMarker));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.MARKED_ELEMENT__START_MARKER, oldStartMarker, startMarker));
 			}
 		}
 		return startMarker;
@@ -201,7 +176,6 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Marker basicGetStartMarker() {
@@ -210,16 +184,13 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setStartMarker(Marker newStartMarker) {
 		Marker oldStartMarker = startMarker;
 		startMarker = newStartMarker;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.MARKED_ELEMENT__START_MARKER, oldStartMarker,
-					startMarker));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKED_ELEMENT__START_MARKER, oldStartMarker, startMarker));
 	}
 
 	/**
@@ -237,23 +208,22 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean referencedStartMarkerHasId(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.MARKED_ELEMENT,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP,
-						REFERENCED_START_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR,
-						DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.MARKED_ELEMENT__REFERENCED_START_MARKER_HAS_ID);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.MARKED_ELEMENT,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP,
+				 REFERENCED_START_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.MARKED_ELEMENT__REFERENCED_START_MARKER_HAS_ID);
 	}
 
 	/**
@@ -271,23 +241,22 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean referencedMidMarkerHasId(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.MARKED_ELEMENT,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP,
-						REFERENCED_MID_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR,
-						DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.MARKED_ELEMENT__REFERENCED_MID_MARKER_HAS_ID);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.MARKED_ELEMENT,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP,
+				 REFERENCED_MID_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.MARKED_ELEMENT__REFERENCED_MID_MARKER_HAS_ID);
 	}
 
 	/**
@@ -305,112 +274,103 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean referencedEndMarkerHasId(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.MARKED_ELEMENT,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP,
-						REFERENCED_END_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR,
-						DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.MARKED_ELEMENT__REFERENCED_END_MARKER_HAS_ID);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.MARKED_ELEMENT,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP,
+				 REFERENCED_END_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.MARKED_ELEMENT__REFERENCED_END_MARKER_HAS_ID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.MARKED_ELEMENT__END_MARKER:
-			if (resolve)
-				return getEndMarker();
-			return basicGetEndMarker();
-		case DGPackage.MARKED_ELEMENT__MID_MARKER:
-			if (resolve)
-				return getMidMarker();
-			return basicGetMidMarker();
-		case DGPackage.MARKED_ELEMENT__START_MARKER:
-			if (resolve)
-				return getStartMarker();
-			return basicGetStartMarker();
+			case DGPackage.MARKED_ELEMENT__END_MARKER:
+				if (resolve) return getEndMarker();
+				return basicGetEndMarker();
+			case DGPackage.MARKED_ELEMENT__MID_MARKER:
+				if (resolve) return getMidMarker();
+				return basicGetMidMarker();
+			case DGPackage.MARKED_ELEMENT__START_MARKER:
+				if (resolve) return getStartMarker();
+				return basicGetStartMarker();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.MARKED_ELEMENT__END_MARKER:
-			setEndMarker((Marker) newValue);
-			return;
-		case DGPackage.MARKED_ELEMENT__MID_MARKER:
-			setMidMarker((Marker) newValue);
-			return;
-		case DGPackage.MARKED_ELEMENT__START_MARKER:
-			setStartMarker((Marker) newValue);
-			return;
+			case DGPackage.MARKED_ELEMENT__END_MARKER:
+				setEndMarker((Marker)newValue);
+				return;
+			case DGPackage.MARKED_ELEMENT__MID_MARKER:
+				setMidMarker((Marker)newValue);
+				return;
+			case DGPackage.MARKED_ELEMENT__START_MARKER:
+				setStartMarker((Marker)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.MARKED_ELEMENT__END_MARKER:
-			setEndMarker((Marker) null);
-			return;
-		case DGPackage.MARKED_ELEMENT__MID_MARKER:
-			setMidMarker((Marker) null);
-			return;
-		case DGPackage.MARKED_ELEMENT__START_MARKER:
-			setStartMarker((Marker) null);
-			return;
+			case DGPackage.MARKED_ELEMENT__END_MARKER:
+				setEndMarker((Marker)null);
+				return;
+			case DGPackage.MARKED_ELEMENT__MID_MARKER:
+				setMidMarker((Marker)null);
+				return;
+			case DGPackage.MARKED_ELEMENT__START_MARKER:
+				setStartMarker((Marker)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.MARKED_ELEMENT__END_MARKER:
-			return endMarker != null;
-		case DGPackage.MARKED_ELEMENT__MID_MARKER:
-			return midMarker != null;
-		case DGPackage.MARKED_ELEMENT__START_MARKER:
-			return startMarker != null;
+			case DGPackage.MARKED_ELEMENT__END_MARKER:
+				return endMarker != null;
+			case DGPackage.MARKED_ELEMENT__MID_MARKER:
+				return midMarker != null;
+			case DGPackage.MARKED_ELEMENT__START_MARKER:
+				return startMarker != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -418,16 +378,12 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
-			return referencedStartMarkerHasId(
-					(DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
-		case DGPackage.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
-			return referencedMidMarkerHasId((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
-		case DGPackage.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
-			return referencedEndMarkerHasId((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
+				return referencedStartMarkerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+			case DGPackage.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
+				return referencedMidMarkerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+			case DGPackage.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
+				return referencedEndMarkerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java
index fa7148fc24f..8f99c1e14dc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java
@@ -31,19 +31,17 @@ import org.eclipse.papyrus.dd.dg.Marker;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl#getSize <em>Size</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl#getReference <em>
- * Reference</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl#getSize <em>Size</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl#getReference <em>Reference</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class MarkerImpl extends GroupImpl implements Marker {
 	/**
-	 * The cached value of the '{@link #getSize() <em>Size</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getSize() <em>Size</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getSize()
 	 * @generated
 	 * @ordered
@@ -51,9 +49,8 @@ public class MarkerImpl extends GroupImpl implements Marker {
 	protected Dimension size;
 
 	/**
-	 * The cached value of the '{@link #getReference() <em>Reference</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getReference() <em>Reference</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getReference()
 	 * @generated
 	 * @ordered
@@ -62,7 +59,6 @@ public class MarkerImpl extends GroupImpl implements Marker {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected MarkerImpl() {
@@ -71,7 +67,6 @@ public class MarkerImpl extends GroupImpl implements Marker {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -81,7 +76,6 @@ public class MarkerImpl extends GroupImpl implements Marker {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Dimension getSize() {
@@ -90,7 +84,6 @@ public class MarkerImpl extends GroupImpl implements Marker {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetSize(Dimension newSize,
@@ -98,43 +91,32 @@ public class MarkerImpl extends GroupImpl implements Marker {
 		Dimension oldSize = size;
 		size = newSize;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.MARKER__SIZE, oldSize, newSize);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.MARKER__SIZE, oldSize, newSize);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setSize(Dimension newSize) {
 		if (newSize != size) {
 			NotificationChain msgs = null;
 			if (size != null)
-				msgs = ((InternalEObject) size).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__SIZE, null,
-						msgs);
+				msgs = ((InternalEObject)size).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__SIZE, null, msgs);
 			if (newSize != null)
-				msgs = ((InternalEObject) newSize).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__SIZE, null,
-						msgs);
+				msgs = ((InternalEObject)newSize).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__SIZE, null, msgs);
 			msgs = basicSetSize(newSize, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.MARKER__SIZE, newSize, newSize));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKER__SIZE, newSize, newSize));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getReference() {
@@ -143,7 +125,6 @@ public class MarkerImpl extends GroupImpl implements Marker {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetReference(Point newReference,
@@ -151,122 +132,106 @@ public class MarkerImpl extends GroupImpl implements Marker {
 		Point oldReference = reference;
 		reference = newReference;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.MARKER__REFERENCE,
-					oldReference, newReference);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.MARKER__REFERENCE, oldReference, newReference);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setReference(Point newReference) {
 		if (newReference != reference) {
 			NotificationChain msgs = null;
 			if (reference != null)
-				msgs = ((InternalEObject) reference).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__REFERENCE,
-						null, msgs);
+				msgs = ((InternalEObject)reference).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__REFERENCE, null, msgs);
 			if (newReference != null)
-				msgs = ((InternalEObject) newReference).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__REFERENCE,
-						null, msgs);
+				msgs = ((InternalEObject)newReference).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__REFERENCE, null, msgs);
 			msgs = basicSetReference(newReference, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.MARKER__REFERENCE, newReference, newReference));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKER__REFERENCE, newReference, newReference));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.MARKER__SIZE:
-			return basicSetSize(null, msgs);
-		case DGPackage.MARKER__REFERENCE:
-			return basicSetReference(null, msgs);
+			case DGPackage.MARKER__SIZE:
+				return basicSetSize(null, msgs);
+			case DGPackage.MARKER__REFERENCE:
+				return basicSetReference(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.MARKER__SIZE:
-			return getSize();
-		case DGPackage.MARKER__REFERENCE:
-			return getReference();
+			case DGPackage.MARKER__SIZE:
+				return getSize();
+			case DGPackage.MARKER__REFERENCE:
+				return getReference();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.MARKER__SIZE:
-			setSize((Dimension) newValue);
-			return;
-		case DGPackage.MARKER__REFERENCE:
-			setReference((Point) newValue);
-			return;
+			case DGPackage.MARKER__SIZE:
+				setSize((Dimension)newValue);
+				return;
+			case DGPackage.MARKER__REFERENCE:
+				setReference((Point)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.MARKER__SIZE:
-			setSize((Dimension) null);
-			return;
-		case DGPackage.MARKER__REFERENCE:
-			setReference((Point) null);
-			return;
+			case DGPackage.MARKER__SIZE:
+				setSize((Dimension)null);
+				return;
+			case DGPackage.MARKER__REFERENCE:
+				setReference((Point)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.MARKER__SIZE:
-			return size != null;
-		case DGPackage.MARKER__REFERENCE:
-			return reference != null;
+			case DGPackage.MARKER__SIZE:
+				return size != null;
+			case DGPackage.MARKER__REFERENCE:
+				return reference != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java
index 900a78c99bd..ea01fdcb707 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java
@@ -26,15 +26,15 @@ import org.eclipse.papyrus.dd.dg.Matrix;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getA <em>A</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getB <em>B</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getC <em>C</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getD <em>D</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getE <em>E</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getF <em>F</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getA <em>A</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getB <em>B</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getC <em>C</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getD <em>D</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getE <em>E</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getF <em>F</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class MatrixImpl extends TransformImpl implements Matrix {
@@ -160,7 +160,6 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected MatrixImpl() {
@@ -169,7 +168,6 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -179,7 +177,6 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getA() {
@@ -188,20 +185,17 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setA(double newA) {
 		double oldA = a;
 		a = newA;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.MATRIX__A, oldA, a));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__A, oldA, a));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getB() {
@@ -210,20 +204,17 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setB(double newB) {
 		double oldB = b;
 		b = newB;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.MATRIX__B, oldB, b));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__B, oldB, b));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getC() {
@@ -232,20 +223,17 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setC(double newC) {
 		double oldC = c;
 		c = newC;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.MATRIX__C, oldC, c));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__C, oldC, c));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getD() {
@@ -254,20 +242,17 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setD(double newD) {
 		double oldD = d;
 		d = newD;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.MATRIX__D, oldD, d));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__D, oldD, d));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getE() {
@@ -276,20 +261,17 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setE(double newE) {
 		double oldE = e;
 		e = newE;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.MATRIX__E, oldE, e));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__E, oldE, e));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getF() {
@@ -298,134 +280,126 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setF(double newF) {
 		double oldF = f;
 		f = newF;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.MATRIX__F, oldF, f));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__F, oldF, f));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.MATRIX__A:
-			return getA();
-		case DGPackage.MATRIX__B:
-			return getB();
-		case DGPackage.MATRIX__C:
-			return getC();
-		case DGPackage.MATRIX__D:
-			return getD();
-		case DGPackage.MATRIX__E:
-			return getE();
-		case DGPackage.MATRIX__F:
-			return getF();
+			case DGPackage.MATRIX__A:
+				return getA();
+			case DGPackage.MATRIX__B:
+				return getB();
+			case DGPackage.MATRIX__C:
+				return getC();
+			case DGPackage.MATRIX__D:
+				return getD();
+			case DGPackage.MATRIX__E:
+				return getE();
+			case DGPackage.MATRIX__F:
+				return getF();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.MATRIX__A:
-			setA((Double) newValue);
-			return;
-		case DGPackage.MATRIX__B:
-			setB((Double) newValue);
-			return;
-		case DGPackage.MATRIX__C:
-			setC((Double) newValue);
-			return;
-		case DGPackage.MATRIX__D:
-			setD((Double) newValue);
-			return;
-		case DGPackage.MATRIX__E:
-			setE((Double) newValue);
-			return;
-		case DGPackage.MATRIX__F:
-			setF((Double) newValue);
-			return;
+			case DGPackage.MATRIX__A:
+				setA((Double)newValue);
+				return;
+			case DGPackage.MATRIX__B:
+				setB((Double)newValue);
+				return;
+			case DGPackage.MATRIX__C:
+				setC((Double)newValue);
+				return;
+			case DGPackage.MATRIX__D:
+				setD((Double)newValue);
+				return;
+			case DGPackage.MATRIX__E:
+				setE((Double)newValue);
+				return;
+			case DGPackage.MATRIX__F:
+				setF((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.MATRIX__A:
-			setA(A_EDEFAULT);
-			return;
-		case DGPackage.MATRIX__B:
-			setB(B_EDEFAULT);
-			return;
-		case DGPackage.MATRIX__C:
-			setC(C_EDEFAULT);
-			return;
-		case DGPackage.MATRIX__D:
-			setD(D_EDEFAULT);
-			return;
-		case DGPackage.MATRIX__E:
-			setE(E_EDEFAULT);
-			return;
-		case DGPackage.MATRIX__F:
-			setF(F_EDEFAULT);
-			return;
+			case DGPackage.MATRIX__A:
+				setA(A_EDEFAULT);
+				return;
+			case DGPackage.MATRIX__B:
+				setB(B_EDEFAULT);
+				return;
+			case DGPackage.MATRIX__C:
+				setC(C_EDEFAULT);
+				return;
+			case DGPackage.MATRIX__D:
+				setD(D_EDEFAULT);
+				return;
+			case DGPackage.MATRIX__E:
+				setE(E_EDEFAULT);
+				return;
+			case DGPackage.MATRIX__F:
+				setF(F_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.MATRIX__A:
-			return a != A_EDEFAULT;
-		case DGPackage.MATRIX__B:
-			return b != B_EDEFAULT;
-		case DGPackage.MATRIX__C:
-			return c != C_EDEFAULT;
-		case DGPackage.MATRIX__D:
-			return d != D_EDEFAULT;
-		case DGPackage.MATRIX__E:
-			return e != E_EDEFAULT;
-		case DGPackage.MATRIX__F:
-			return f != F_EDEFAULT;
+			case DGPackage.MATRIX__A:
+				return a != A_EDEFAULT;
+			case DGPackage.MATRIX__B:
+				return b != B_EDEFAULT;
+			case DGPackage.MATRIX__C:
+				return c != C_EDEFAULT;
+			case DGPackage.MATRIX__D:
+				return d != D_EDEFAULT;
+			case DGPackage.MATRIX__E:
+				return e != E_EDEFAULT;
+			case DGPackage.MATRIX__F:
+				return f != F_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (a: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java
index 3205cf0362c..8f37118cc3f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java
@@ -30,18 +30,16 @@ import org.eclipse.papyrus.dd.dg.MoveTo;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.MoveToImpl#getPoint <em>Point</em>}
- * </li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MoveToImpl#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class MoveToImpl extends PathCommandImpl implements MoveTo {
 	/**
-	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getPoint()
 	 * @generated
 	 * @ordered
@@ -50,7 +48,6 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected MoveToImpl() {
@@ -59,7 +56,6 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -69,7 +65,6 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getPoint() {
@@ -78,7 +73,6 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetPoint(Point newPoint,
@@ -86,110 +80,94 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 		Point oldPoint = point;
 		point = newPoint;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.MOVE_TO__POINT, oldPoint,
-					newPoint);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.MOVE_TO__POINT, oldPoint, newPoint);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setPoint(Point newPoint) {
 		if (newPoint != point) {
 			NotificationChain msgs = null;
 			if (point != null)
-				msgs = ((InternalEObject) point).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.MOVE_TO__POINT,
-						null, msgs);
+				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.MOVE_TO__POINT, null, msgs);
 			if (newPoint != null)
-				msgs = ((InternalEObject) newPoint).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.MOVE_TO__POINT,
-						null, msgs);
+				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.MOVE_TO__POINT, null, msgs);
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.MOVE_TO__POINT, newPoint, newPoint));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MOVE_TO__POINT, newPoint, newPoint));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.MOVE_TO__POINT:
-			return basicSetPoint(null, msgs);
+			case DGPackage.MOVE_TO__POINT:
+				return basicSetPoint(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.MOVE_TO__POINT:
-			return getPoint();
+			case DGPackage.MOVE_TO__POINT:
+				return getPoint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.MOVE_TO__POINT:
-			setPoint((Point) newValue);
-			return;
+			case DGPackage.MOVE_TO__POINT:
+				setPoint((Point)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.MOVE_TO__POINT:
-			setPoint((Point) null);
-			return;
+			case DGPackage.MOVE_TO__POINT:
+				setPoint((Point)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.MOVE_TO__POINT:
-			return point != null;
+			case DGPackage.MOVE_TO__POINT:
+				return point != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java
index 6cb0c90062a..d39d471fac8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java
@@ -37,19 +37,17 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintImpl#getColor <em>Color</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintImpl#getPaintServer <em>Paint
- * Server</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintImpl#getColor <em>Color</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintImpl#getPaintServer <em>Paint Server</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	/**
 	 * The default value of the '{@link #getColor() <em>Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getColor()
 	 * @generated
 	 * @ordered
@@ -59,7 +57,6 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	/**
 	 * The cached value of the '{@link #getColor() <em>Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getColor()
 	 * @generated
 	 * @ordered
@@ -67,9 +64,8 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	protected Color color = COLOR_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getPaintServer() <em>Paint Server</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getPaintServer() <em>Paint Server</em>}' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getPaintServer()
 	 * @generated
 	 * @ordered
@@ -78,7 +74,6 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected PaintImpl() {
@@ -87,7 +82,6 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,7 +91,6 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Color getColor() {
@@ -106,31 +99,26 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setColor(Color newColor) {
 		Color oldColor = color;
 		color = newColor;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.PAINT__COLOR, oldColor, color));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PAINT__COLOR, oldColor, color));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public PaintServer getPaintServer() {
 		if (paintServer != null && paintServer.eIsProxy()) {
-			InternalEObject oldPaintServer = (InternalEObject) paintServer;
-			paintServer = (PaintServer) eResolveProxy(oldPaintServer);
+			InternalEObject oldPaintServer = (InternalEObject)paintServer;
+			paintServer = (PaintServer)eResolveProxy(oldPaintServer);
 			if (paintServer != oldPaintServer) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							DGPackage.PAINT__PAINT_SERVER, oldPaintServer,
-							paintServer));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.PAINT__PAINT_SERVER, oldPaintServer, paintServer));
 			}
 		}
 		return paintServer;
@@ -138,7 +126,6 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public PaintServer basicGetPaintServer() {
@@ -147,15 +134,13 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setPaintServer(PaintServer newPaintServer) {
 		PaintServer oldPaintServer = paintServer;
 		paintServer = newPaintServer;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.PAINT__PAINT_SERVER, oldPaintServer, paintServer));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PAINT__PAINT_SERVER, oldPaintServer, paintServer));
 	}
 
 	/**
@@ -173,98 +158,91 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean referencedPaintServerHasId(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.PAINT,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP,
-						REFERENCED_PAINT_SERVER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.PAINT__REFERENCED_PAINT_SERVER_HAS_ID);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.PAINT,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP,
+				 REFERENCED_PAINT_SERVER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.PAINT__REFERENCED_PAINT_SERVER_HAS_ID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.PAINT__COLOR:
-			return getColor();
-		case DGPackage.PAINT__PAINT_SERVER:
-			if (resolve)
-				return getPaintServer();
-			return basicGetPaintServer();
+			case DGPackage.PAINT__COLOR:
+				return getColor();
+			case DGPackage.PAINT__PAINT_SERVER:
+				if (resolve) return getPaintServer();
+				return basicGetPaintServer();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.PAINT__COLOR:
-			setColor((Color) newValue);
-			return;
-		case DGPackage.PAINT__PAINT_SERVER:
-			setPaintServer((PaintServer) newValue);
-			return;
+			case DGPackage.PAINT__COLOR:
+				setColor((Color)newValue);
+				return;
+			case DGPackage.PAINT__PAINT_SERVER:
+				setPaintServer((PaintServer)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.PAINT__COLOR:
-			setColor(COLOR_EDEFAULT);
-			return;
-		case DGPackage.PAINT__PAINT_SERVER:
-			setPaintServer((PaintServer) null);
-			return;
+			case DGPackage.PAINT__COLOR:
+				setColor(COLOR_EDEFAULT);
+				return;
+			case DGPackage.PAINT__PAINT_SERVER:
+				setPaintServer((PaintServer)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.PAINT__COLOR:
-			return COLOR_EDEFAULT == null ? color != null : !COLOR_EDEFAULT
-					.equals(color);
-		case DGPackage.PAINT__PAINT_SERVER:
-			return paintServer != null;
+			case DGPackage.PAINT__COLOR:
+				return COLOR_EDEFAULT == null ? color != null : !COLOR_EDEFAULT.equals(color);
+			case DGPackage.PAINT__PAINT_SERVER:
+				return paintServer != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -272,23 +250,19 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP:
-			return referencedPaintServerHasId(
-					(DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP:
+				return referencedPaintServerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (color: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java
index 6d5b9cfabdc..3c4af5ba7f1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java
@@ -33,19 +33,17 @@ import org.eclipse.papyrus.dd.dg.Transform;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintServerImpl#getTransforms <em>
- * Transform</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintServerImpl#getTransforms <em>Transform</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class PaintServerImpl extends DefinitionImpl implements
 		PaintServer {
 	/**
-	 * The cached value of the '{@link #getTransforms() <em>Transform</em>}'
-	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getTransforms() <em>Transform</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getTransforms()
 	 * @generated
 	 * @ordered
@@ -54,7 +52,6 @@ public abstract class PaintServerImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected PaintServerImpl() {
@@ -63,7 +60,6 @@ public abstract class PaintServerImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,89 +69,81 @@ public abstract class PaintServerImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<Transform> getTransforms() {
 		if (transforms == null) {
-			transforms = new EObjectContainmentEList<Transform>(
-					Transform.class, this, DGPackage.PAINT_SERVER__TRANSFORM);
+			transforms = new EObjectContainmentEList<Transform>(Transform.class, this, DGPackage.PAINT_SERVER__TRANSFORM);
 		}
 		return transforms;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.PAINT_SERVER__TRANSFORM:
-			return ((InternalEList<?>) getTransforms()).basicRemove(otherEnd,
-					msgs);
+			case DGPackage.PAINT_SERVER__TRANSFORM:
+				return ((InternalEList<?>)getTransforms()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.PAINT_SERVER__TRANSFORM:
-			return getTransforms();
+			case DGPackage.PAINT_SERVER__TRANSFORM:
+				return getTransforms();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.PAINT_SERVER__TRANSFORM:
-			getTransforms().clear();
-			getTransforms().addAll((Collection<? extends Transform>) newValue);
-			return;
+			case DGPackage.PAINT_SERVER__TRANSFORM:
+				getTransforms().clear();
+				getTransforms().addAll((Collection<? extends Transform>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.PAINT_SERVER__TRANSFORM:
-			getTransforms().clear();
-			return;
+			case DGPackage.PAINT_SERVER__TRANSFORM:
+				getTransforms().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.PAINT_SERVER__TRANSFORM:
-			return transforms != null && !transforms.isEmpty();
+			case DGPackage.PAINT_SERVER__TRANSFORM:
+				return transforms != null && !transforms.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java
index 59dea1b0308..9486a5a582c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java
@@ -27,19 +27,17 @@ import org.eclipse.papyrus.dd.dg.PathCommand;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.PathCommandImpl#isRelative <em>Is
- * Relative</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PathCommandImpl#isRelative <em>Is Relative</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class PathCommandImpl extends MinimalEObjectImpl.Container
 		implements PathCommand {
 	/**
-	 * The default value of the '{@link #isRelative() <em>Is Relative</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #isRelative() <em>Is Relative</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isRelative()
 	 * @generated
 	 * @ordered
@@ -47,9 +45,8 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container
 	protected static final boolean IS_RELATIVE_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isRelative() <em>Is Relative</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #isRelative() <em>Is Relative</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isRelative()
 	 * @generated
 	 * @ordered
@@ -58,7 +55,6 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected PathCommandImpl() {
@@ -67,7 +63,6 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,7 +72,6 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isRelative() {
@@ -86,85 +80,76 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setIsRelative(boolean newIsRelative) {
 		boolean oldIsRelative = isRelative;
 		isRelative = newIsRelative;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.PATH_COMMAND__IS_RELATIVE, oldIsRelative,
-					isRelative));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PATH_COMMAND__IS_RELATIVE, oldIsRelative, isRelative));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.PATH_COMMAND__IS_RELATIVE:
-			return isRelative();
+			case DGPackage.PATH_COMMAND__IS_RELATIVE:
+				return isRelative();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.PATH_COMMAND__IS_RELATIVE:
-			setIsRelative((Boolean) newValue);
-			return;
+			case DGPackage.PATH_COMMAND__IS_RELATIVE:
+				setIsRelative((Boolean)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.PATH_COMMAND__IS_RELATIVE:
-			setIsRelative(IS_RELATIVE_EDEFAULT);
-			return;
+			case DGPackage.PATH_COMMAND__IS_RELATIVE:
+				setIsRelative(IS_RELATIVE_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.PATH_COMMAND__IS_RELATIVE:
-			return isRelative != IS_RELATIVE_EDEFAULT;
+			case DGPackage.PATH_COMMAND__IS_RELATIVE:
+				return isRelative != IS_RELATIVE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (isRelative: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java
index e7cfcabf7fb..ab4eb4d1583 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java
@@ -38,18 +38,16 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.PathImpl#getCommands <em>Command
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PathImpl#getCommands <em>Command</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class PathImpl extends MarkedElementImpl implements Path {
 	/**
-	 * The cached value of the '{@link #getCommands() <em>Command</em>}'
-	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getCommands() <em>Command</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCommands()
 	 * @generated
 	 * @ordered
@@ -58,7 +56,6 @@ public class PathImpl extends MarkedElementImpl implements Path {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected PathImpl() {
@@ -67,7 +64,6 @@ public class PathImpl extends MarkedElementImpl implements Path {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,13 +73,11 @@ public class PathImpl extends MarkedElementImpl implements Path {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<PathCommand> getCommands() {
 		if (commands == null) {
-			commands = new EObjectContainmentEList<PathCommand>(
-					PathCommand.class, this, DGPackage.PATH__COMMAND);
+			commands = new EObjectContainmentEList<PathCommand>(PathCommand.class, this, DGPackage.PATH__COMMAND);
 		}
 		return commands;
 	}
@@ -103,103 +97,96 @@ public class PathImpl extends MarkedElementImpl implements Path {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean firstCommandMustBeMove(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.PATH,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP,
-						FIRST_COMMAND_MUST_BE_MOVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.PATH__FIRST_COMMAND_MUST_BE_MOVE);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.PATH,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP,
+				 FIRST_COMMAND_MUST_BE_MOVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.PATH__FIRST_COMMAND_MUST_BE_MOVE);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.PATH__COMMAND:
-			return ((InternalEList<?>) getCommands()).basicRemove(otherEnd,
-					msgs);
+			case DGPackage.PATH__COMMAND:
+				return ((InternalEList<?>)getCommands()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.PATH__COMMAND:
-			return getCommands();
+			case DGPackage.PATH__COMMAND:
+				return getCommands();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.PATH__COMMAND:
-			getCommands().clear();
-			getCommands().addAll((Collection<? extends PathCommand>) newValue);
-			return;
+			case DGPackage.PATH__COMMAND:
+				getCommands().clear();
+				getCommands().addAll((Collection<? extends PathCommand>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.PATH__COMMAND:
-			getCommands().clear();
-			return;
+			case DGPackage.PATH__COMMAND:
+				getCommands().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.PATH__COMMAND:
-			return commands != null && !commands.isEmpty();
+			case DGPackage.PATH__COMMAND:
+				return commands != null && !commands.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -207,9 +194,8 @@ public class PathImpl extends MarkedElementImpl implements Path {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP:
-			return firstCommandMustBeMove((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP:
+				return firstCommandMustBeMove((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java
index d1d7ed040ee..5c5ce1126c7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java
@@ -31,19 +31,17 @@ import org.eclipse.papyrus.dd.dg.Pattern;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.PatternImpl#getBounds <em>Bounds
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.PatternImpl#getTile <em>Tile</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PatternImpl#getBounds <em>Bounds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PatternImpl#getTile <em>Tile</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class PatternImpl extends PaintServerImpl implements Pattern {
 	/**
-	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -51,9 +49,8 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 	protected Bounds bounds;
 
 	/**
-	 * The cached value of the '{@link #getTile() <em>Tile</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getTile() <em>Tile</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getTile()
 	 * @generated
 	 * @ordered
@@ -62,7 +59,6 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected PatternImpl() {
@@ -71,7 +67,6 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -81,7 +76,6 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -90,7 +84,6 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBounds(Bounds newBounds,
@@ -98,44 +91,32 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.PATTERN__BOUNDS, oldBounds,
-					newBounds);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.PATTERN__BOUNDS, oldBounds, newBounds);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
 		if (newBounds != bounds) {
 			NotificationChain msgs = null;
 			if (bounds != null)
-				msgs = ((InternalEObject) bounds).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__BOUNDS,
-						null, msgs);
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__BOUNDS, null, msgs);
 			if (newBounds != null)
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__BOUNDS,
-						null, msgs);
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.PATTERN__BOUNDS, newBounds, newBounds));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PATTERN__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public GraphicalElement getTile() {
@@ -144,7 +125,6 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTile(GraphicalElement newTile,
@@ -152,121 +132,106 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 		GraphicalElement oldTile = tile;
 		tile = newTile;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.PATTERN__TILE, oldTile, newTile);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.PATTERN__TILE, oldTile, newTile);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setTile(GraphicalElement newTile) {
 		if (newTile != tile) {
 			NotificationChain msgs = null;
 			if (tile != null)
-				msgs = ((InternalEObject) tile).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__TILE, null,
-						msgs);
+				msgs = ((InternalEObject)tile).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__TILE, null, msgs);
 			if (newTile != null)
-				msgs = ((InternalEObject) newTile).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__TILE, null,
-						msgs);
+				msgs = ((InternalEObject)newTile).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__TILE, null, msgs);
 			msgs = basicSetTile(newTile, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.PATTERN__TILE, newTile, newTile));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PATTERN__TILE, newTile, newTile));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.PATTERN__BOUNDS:
-			return basicSetBounds(null, msgs);
-		case DGPackage.PATTERN__TILE:
-			return basicSetTile(null, msgs);
+			case DGPackage.PATTERN__BOUNDS:
+				return basicSetBounds(null, msgs);
+			case DGPackage.PATTERN__TILE:
+				return basicSetTile(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.PATTERN__BOUNDS:
-			return getBounds();
-		case DGPackage.PATTERN__TILE:
-			return getTile();
+			case DGPackage.PATTERN__BOUNDS:
+				return getBounds();
+			case DGPackage.PATTERN__TILE:
+				return getTile();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.PATTERN__BOUNDS:
-			setBounds((Bounds) newValue);
-			return;
-		case DGPackage.PATTERN__TILE:
-			setTile((GraphicalElement) newValue);
-			return;
+			case DGPackage.PATTERN__BOUNDS:
+				setBounds((Bounds)newValue);
+				return;
+			case DGPackage.PATTERN__TILE:
+				setTile((GraphicalElement)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.PATTERN__BOUNDS:
-			setBounds((Bounds) null);
-			return;
-		case DGPackage.PATTERN__TILE:
-			setTile((GraphicalElement) null);
-			return;
+			case DGPackage.PATTERN__BOUNDS:
+				setBounds((Bounds)null);
+				return;
+			case DGPackage.PATTERN__TILE:
+				setTile((GraphicalElement)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.PATTERN__BOUNDS:
-			return bounds != null;
-		case DGPackage.PATTERN__TILE:
-			return tile != null;
+			case DGPackage.PATTERN__BOUNDS:
+				return bounds != null;
+			case DGPackage.PATTERN__TILE:
+				return tile != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java
index 6d57c528441..0074d113279 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java
@@ -34,18 +34,16 @@ import org.eclipse.papyrus.dd.dg.Polygon;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.PolygonImpl#getPoints <em>Point
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PolygonImpl#getPoints <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class PolygonImpl extends MarkedElementImpl implements Polygon {
 	/**
-	 * The cached value of the '{@link #getPoints() <em>Point</em>}' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getPoints() <em>Point</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getPoints()
 	 * @generated
 	 * @ordered
@@ -54,7 +52,6 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected PolygonImpl() {
@@ -63,7 +60,6 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,88 +69,81 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<Point> getPoints() {
 		if (points == null) {
-			points = new EObjectContainmentEList<Point>(Point.class, this,
-					DGPackage.POLYGON__POINT);
+			points = new EObjectContainmentEList<Point>(Point.class, this, DGPackage.POLYGON__POINT);
 		}
 		return points;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.POLYGON__POINT:
-			return ((InternalEList<?>) getPoints()).basicRemove(otherEnd, msgs);
+			case DGPackage.POLYGON__POINT:
+				return ((InternalEList<?>)getPoints()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.POLYGON__POINT:
-			return getPoints();
+			case DGPackage.POLYGON__POINT:
+				return getPoints();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.POLYGON__POINT:
-			getPoints().clear();
-			getPoints().addAll((Collection<? extends Point>) newValue);
-			return;
+			case DGPackage.POLYGON__POINT:
+				getPoints().clear();
+				getPoints().addAll((Collection<? extends Point>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.POLYGON__POINT:
-			getPoints().clear();
-			return;
+			case DGPackage.POLYGON__POINT:
+				getPoints().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.POLYGON__POINT:
-			return points != null && !points.isEmpty();
+			case DGPackage.POLYGON__POINT:
+				return points != null && !points.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java
index cce07850fcd..090c4835bed 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java
@@ -34,18 +34,16 @@ import org.eclipse.papyrus.dd.dg.Polyline;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.PolylineImpl#getPoints <em>Point
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PolylineImpl#getPoints <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class PolylineImpl extends MarkedElementImpl implements Polyline {
 	/**
-	 * The cached value of the '{@link #getPoints() <em>Point</em>}' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getPoints() <em>Point</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getPoints()
 	 * @generated
 	 * @ordered
@@ -54,7 +52,6 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected PolylineImpl() {
@@ -63,7 +60,6 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,88 +69,81 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<Point> getPoints() {
 		if (points == null) {
-			points = new EObjectContainmentEList<Point>(Point.class, this,
-					DGPackage.POLYLINE__POINT);
+			points = new EObjectContainmentEList<Point>(Point.class, this, DGPackage.POLYLINE__POINT);
 		}
 		return points;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.POLYLINE__POINT:
-			return ((InternalEList<?>) getPoints()).basicRemove(otherEnd, msgs);
+			case DGPackage.POLYLINE__POINT:
+				return ((InternalEList<?>)getPoints()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.POLYLINE__POINT:
-			return getPoints();
+			case DGPackage.POLYLINE__POINT:
+				return getPoints();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.POLYLINE__POINT:
-			getPoints().clear();
-			getPoints().addAll((Collection<? extends Point>) newValue);
-			return;
+			case DGPackage.POLYLINE__POINT:
+				getPoints().clear();
+				getPoints().addAll((Collection<? extends Point>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.POLYLINE__POINT:
-			getPoints().clear();
-			return;
+			case DGPackage.POLYLINE__POINT:
+				getPoints().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.POLYLINE__POINT:
-			return points != null && !points.isEmpty();
+			case DGPackage.POLYLINE__POINT:
+				return points != null && !points.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java
index 3d6d6b93a2a..83b7784bf49 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java
@@ -30,21 +30,18 @@ import org.eclipse.papyrus.dd.dg.QuadraticCurveTo;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl#getControl
- * <em>Control</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl#getPoint <em>
- * Point</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl#getControl <em>Control</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class QuadraticCurveToImpl extends PathCommandImpl implements
 		QuadraticCurveTo {
 	/**
-	 * The cached value of the '{@link #getControl() <em>Control</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getControl() <em>Control</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getControl()
 	 * @generated
 	 * @ordered
@@ -52,9 +49,8 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 	protected Point control;
 
 	/**
-	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getPoint()
 	 * @generated
 	 * @ordered
@@ -63,7 +59,6 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected QuadraticCurveToImpl() {
@@ -72,7 +67,6 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -82,7 +76,6 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getPoint() {
@@ -91,7 +84,6 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetPoint(Point newPoint,
@@ -99,46 +91,32 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 		Point oldPoint = point;
 		point = newPoint;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.QUADRATIC_CURVE_TO__POINT,
-					oldPoint, newPoint);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.QUADRATIC_CURVE_TO__POINT, oldPoint, newPoint);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setPoint(Point newPoint) {
 		if (newPoint != point) {
 			NotificationChain msgs = null;
 			if (point != null)
-				msgs = ((InternalEObject) point).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.QUADRATIC_CURVE_TO__POINT, null,
-						msgs);
+				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__POINT, null, msgs);
 			if (newPoint != null)
-				msgs = ((InternalEObject) newPoint).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.QUADRATIC_CURVE_TO__POINT, null,
-						msgs);
+				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__POINT, null, msgs);
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.QUADRATIC_CURVE_TO__POINT, newPoint, newPoint));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.QUADRATIC_CURVE_TO__POINT, newPoint, newPoint));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getControl() {
@@ -147,7 +125,6 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetControl(Point newControl,
@@ -155,125 +132,106 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 		Point oldControl = control;
 		control = newControl;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.QUADRATIC_CURVE_TO__CONTROL,
-					oldControl, newControl);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.QUADRATIC_CURVE_TO__CONTROL, oldControl, newControl);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setControl(Point newControl) {
 		if (newControl != control) {
 			NotificationChain msgs = null;
 			if (control != null)
-				msgs = ((InternalEObject) control).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.QUADRATIC_CURVE_TO__CONTROL, null,
-						msgs);
+				msgs = ((InternalEObject)control).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__CONTROL, null, msgs);
 			if (newControl != null)
-				msgs = ((InternalEObject) newControl).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.QUADRATIC_CURVE_TO__CONTROL, null,
-						msgs);
+				msgs = ((InternalEObject)newControl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__CONTROL, null, msgs);
 			msgs = basicSetControl(newControl, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.QUADRATIC_CURVE_TO__CONTROL, newControl,
-					newControl));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.QUADRATIC_CURVE_TO__CONTROL, newControl, newControl));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-			return basicSetControl(null, msgs);
-		case DGPackage.QUADRATIC_CURVE_TO__POINT:
-			return basicSetPoint(null, msgs);
+			case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
+				return basicSetControl(null, msgs);
+			case DGPackage.QUADRATIC_CURVE_TO__POINT:
+				return basicSetPoint(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-			return getControl();
-		case DGPackage.QUADRATIC_CURVE_TO__POINT:
-			return getPoint();
+			case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
+				return getControl();
+			case DGPackage.QUADRATIC_CURVE_TO__POINT:
+				return getPoint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-			setControl((Point) newValue);
-			return;
-		case DGPackage.QUADRATIC_CURVE_TO__POINT:
-			setPoint((Point) newValue);
-			return;
+			case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
+				setControl((Point)newValue);
+				return;
+			case DGPackage.QUADRATIC_CURVE_TO__POINT:
+				setPoint((Point)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-			setControl((Point) null);
-			return;
-		case DGPackage.QUADRATIC_CURVE_TO__POINT:
-			setPoint((Point) null);
-			return;
+			case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
+				setControl((Point)null);
+				return;
+			case DGPackage.QUADRATIC_CURVE_TO__POINT:
+				setPoint((Point)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-			return control != null;
-		case DGPackage.QUADRATIC_CURVE_TO__POINT:
-			return point != null;
+			case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
+				return control != null;
+			case DGPackage.QUADRATIC_CURVE_TO__POINT:
+				return point != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java
index bd9bf377c45..cbce0df2967 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java
@@ -39,22 +39,18 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getCenter <em>
- * Center</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getFocus <em>
- * Focus</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getRadius <em>
- * Radius</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getCenter <em>Center</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getFocus <em>Focus</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getRadius <em>Radius</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	/**
-	 * The cached value of the '{@link #getCenter() <em>Center</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getCenter() <em>Center</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCenter()
 	 * @generated
 	 * @ordered
@@ -62,9 +58,8 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	protected Point center;
 
 	/**
-	 * The cached value of the '{@link #getFocus() <em>Focus</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getFocus() <em>Focus</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFocus()
 	 * @generated
 	 * @ordered
@@ -72,9 +67,8 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	protected Point focus;
 
 	/**
-	 * The default value of the '{@link #getRadius() <em>Radius</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getRadius() <em>Radius</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getRadius()
 	 * @generated
 	 * @ordered
@@ -84,7 +78,6 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	/**
 	 * The cached value of the '{@link #getRadius() <em>Radius</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getRadius()
 	 * @generated
 	 * @ordered
@@ -93,7 +86,6 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected RadialGradientImpl() {
@@ -102,7 +94,6 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,7 +103,6 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getCenter() {
@@ -121,7 +111,6 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetCenter(Point newCenter,
@@ -129,44 +118,32 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 		Point oldCenter = center;
 		center = newCenter;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.RADIAL_GRADIENT__CENTER,
-					oldCenter, newCenter);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__CENTER, oldCenter, newCenter);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setCenter(Point newCenter) {
 		if (newCenter != center) {
 			NotificationChain msgs = null;
 			if (center != null)
-				msgs = ((InternalEObject) center)
-						.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-								- DGPackage.RADIAL_GRADIENT__CENTER, null, msgs);
+				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__CENTER, null, msgs);
 			if (newCenter != null)
-				msgs = ((InternalEObject) newCenter)
-						.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-								- DGPackage.RADIAL_GRADIENT__CENTER, null, msgs);
+				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__CENTER, null, msgs);
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.RADIAL_GRADIENT__CENTER, newCenter, newCenter));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__CENTER, newCenter, newCenter));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getFocus() {
@@ -175,7 +152,6 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetFocus(Point newFocus,
@@ -183,44 +159,32 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 		Point oldFocus = focus;
 		focus = newFocus;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.RADIAL_GRADIENT__FOCUS,
-					oldFocus, newFocus);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__FOCUS, oldFocus, newFocus);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setFocus(Point newFocus) {
 		if (newFocus != focus) {
 			NotificationChain msgs = null;
 			if (focus != null)
-				msgs = ((InternalEObject) focus).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.RADIAL_GRADIENT__FOCUS, null, msgs);
+				msgs = ((InternalEObject)focus).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__FOCUS, null, msgs);
 			if (newFocus != null)
-				msgs = ((InternalEObject) newFocus).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.RADIAL_GRADIENT__FOCUS, null, msgs);
+				msgs = ((InternalEObject)newFocus).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__FOCUS, null, msgs);
 			msgs = basicSetFocus(newFocus, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.RADIAL_GRADIENT__FOCUS, newFocus, newFocus));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__FOCUS, newFocus, newFocus));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getRadius() {
@@ -229,25 +193,20 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setRadius(double newRadius) {
 		double oldRadius = radius;
 		radius = newRadius;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.RADIAL_GRADIENT__RADIUS, oldRadius, radius));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__RADIUS, oldRadius, radius));
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Center Point</em>}' invariant operation. <!-- begin-user-doc
+	 * The cached validation expression for the '{@link #validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Center Point</em>}' invariant operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -255,32 +214,29 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validCenterPoint(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.RADIAL_GRADIENT,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP,
-						VALID_CENTER_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.RADIAL_GRADIENT__VALID_CENTER_POINT);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.RADIAL_GRADIENT,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP,
+				 VALID_CENTER_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.RADIAL_GRADIENT__VALID_CENTER_POINT);
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Focus Point</em>}' invariant operation. <!-- begin-user-doc -->
+	 * The cached validation expression for the '{@link #validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Focus Point</em>}' invariant operation.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @see #validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -288,32 +244,29 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validFocusPoint(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.RADIAL_GRADIENT,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP,
-						VALID_FOCUS_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.RADIAL_GRADIENT__VALID_FOCUS_POINT);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.RADIAL_GRADIENT,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP,
+				 VALID_FOCUS_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.RADIAL_GRADIENT__VALID_FOCUS_POINT);
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Radius</em>}' invariant operation. <!-- begin-user-doc --> <!--
+	 * The cached validation expression for the '{@link #validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Radius</em>}' invariant operation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @see #validRadius(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -321,122 +274,116 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validRadius(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.RADIAL_GRADIENT,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP,
-						VALID_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.RADIAL_GRADIENT__VALID_RADIUS);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.RADIAL_GRADIENT,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP,
+				 VALID_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.RADIAL_GRADIENT__VALID_RADIUS);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.RADIAL_GRADIENT__CENTER:
-			return basicSetCenter(null, msgs);
-		case DGPackage.RADIAL_GRADIENT__FOCUS:
-			return basicSetFocus(null, msgs);
+			case DGPackage.RADIAL_GRADIENT__CENTER:
+				return basicSetCenter(null, msgs);
+			case DGPackage.RADIAL_GRADIENT__FOCUS:
+				return basicSetFocus(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.RADIAL_GRADIENT__CENTER:
-			return getCenter();
-		case DGPackage.RADIAL_GRADIENT__FOCUS:
-			return getFocus();
-		case DGPackage.RADIAL_GRADIENT__RADIUS:
-			return getRadius();
+			case DGPackage.RADIAL_GRADIENT__CENTER:
+				return getCenter();
+			case DGPackage.RADIAL_GRADIENT__FOCUS:
+				return getFocus();
+			case DGPackage.RADIAL_GRADIENT__RADIUS:
+				return getRadius();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.RADIAL_GRADIENT__CENTER:
-			setCenter((Point) newValue);
-			return;
-		case DGPackage.RADIAL_GRADIENT__FOCUS:
-			setFocus((Point) newValue);
-			return;
-		case DGPackage.RADIAL_GRADIENT__RADIUS:
-			setRadius((Double) newValue);
-			return;
+			case DGPackage.RADIAL_GRADIENT__CENTER:
+				setCenter((Point)newValue);
+				return;
+			case DGPackage.RADIAL_GRADIENT__FOCUS:
+				setFocus((Point)newValue);
+				return;
+			case DGPackage.RADIAL_GRADIENT__RADIUS:
+				setRadius((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.RADIAL_GRADIENT__CENTER:
-			setCenter((Point) null);
-			return;
-		case DGPackage.RADIAL_GRADIENT__FOCUS:
-			setFocus((Point) null);
-			return;
-		case DGPackage.RADIAL_GRADIENT__RADIUS:
-			setRadius(RADIUS_EDEFAULT);
-			return;
+			case DGPackage.RADIAL_GRADIENT__CENTER:
+				setCenter((Point)null);
+				return;
+			case DGPackage.RADIAL_GRADIENT__FOCUS:
+				setFocus((Point)null);
+				return;
+			case DGPackage.RADIAL_GRADIENT__RADIUS:
+				setRadius(RADIUS_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.RADIAL_GRADIENT__CENTER:
-			return center != null;
-		case DGPackage.RADIAL_GRADIENT__FOCUS:
-			return focus != null;
-		case DGPackage.RADIAL_GRADIENT__RADIUS:
-			return radius != RADIUS_EDEFAULT;
+			case DGPackage.RADIAL_GRADIENT__CENTER:
+				return center != null;
+			case DGPackage.RADIAL_GRADIENT__FOCUS:
+				return focus != null;
+			case DGPackage.RADIAL_GRADIENT__RADIUS:
+				return radius != RADIUS_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -444,28 +391,23 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP:
-			return validCenterPoint((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
-		case DGPackage.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP:
-			return validFocusPoint((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
-		case DGPackage.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP:
-			return validRadius((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP:
+				return validCenterPoint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+			case DGPackage.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP:
+				return validFocusPoint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+			case DGPackage.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP:
+				return validRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (radius: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java
index c8862f61bca..bee3afab487 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java
@@ -36,20 +36,17 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl#getBounds <em>Bounds
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl#getCornerRadius <em>
- * Corner Radius</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl#getBounds <em>Bounds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl#getCornerRadius <em>Corner Radius</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	/**
-	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -57,10 +54,9 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	protected Bounds bounds;
 
 	/**
-	 * The default value of the '{@link #getCornerRadius()
-	 * <em>Corner Radius</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getCornerRadius() <em>Corner Radius</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getCornerRadius()
 	 * @generated
 	 * @ordered
@@ -68,10 +64,9 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	protected static final double CORNER_RADIUS_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getCornerRadius()
-	 * <em>Corner Radius</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getCornerRadius() <em>Corner Radius</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getCornerRadius()
 	 * @generated
 	 * @ordered
@@ -89,7 +84,6 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected RectangleImpl() {
@@ -98,7 +92,6 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -108,7 +101,6 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -117,7 +109,6 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBounds(Bounds newBounds,
@@ -125,44 +116,32 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.RECTANGLE__BOUNDS, oldBounds,
-					newBounds);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.RECTANGLE__BOUNDS, oldBounds, newBounds);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
 		if (newBounds != bounds) {
 			NotificationChain msgs = null;
 			if (bounds != null)
-				msgs = ((InternalEObject) bounds).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.RECTANGLE__BOUNDS,
-						null, msgs);
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RECTANGLE__BOUNDS, null, msgs);
 			if (newBounds != null)
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.RECTANGLE__BOUNDS,
-						null, msgs);
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RECTANGLE__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.RECTANGLE__BOUNDS, newBounds, newBounds));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RECTANGLE__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getCornerRadius() {
@@ -171,7 +150,6 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setCornerRadius(double newCornerRadius) {
@@ -180,14 +158,11 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 		boolean oldCornerRadiusESet = cornerRadiusESet;
 		cornerRadiusESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.RECTANGLE__CORNER_RADIUS, oldCornerRadius,
-					cornerRadius, !oldCornerRadiusESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RECTANGLE__CORNER_RADIUS, oldCornerRadius, cornerRadius, !oldCornerRadiusESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetCornerRadius() {
@@ -196,14 +171,11 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 		cornerRadius = CORNER_RADIUS_EDEFAULT;
 		cornerRadiusESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.RECTANGLE__CORNER_RADIUS, oldCornerRadius,
-					CORNER_RADIUS_EDEFAULT, oldCornerRadiusESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.RECTANGLE__CORNER_RADIUS, oldCornerRadius, CORNER_RADIUS_EDEFAULT, oldCornerRadiusESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetCornerRadius() {
@@ -225,110 +197,104 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean nonNegativeCornerRadius(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.RECTANGLE,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP,
-						NON_NEGATIVE_CORNER_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.RECTANGLE__NON_NEGATIVE_CORNER_RADIUS);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.RECTANGLE,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP,
+				 NON_NEGATIVE_CORNER_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.RECTANGLE__NON_NEGATIVE_CORNER_RADIUS);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.RECTANGLE__BOUNDS:
-			return basicSetBounds(null, msgs);
+			case DGPackage.RECTANGLE__BOUNDS:
+				return basicSetBounds(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.RECTANGLE__BOUNDS:
-			return getBounds();
-		case DGPackage.RECTANGLE__CORNER_RADIUS:
-			return getCornerRadius();
+			case DGPackage.RECTANGLE__BOUNDS:
+				return getBounds();
+			case DGPackage.RECTANGLE__CORNER_RADIUS:
+				return getCornerRadius();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.RECTANGLE__BOUNDS:
-			setBounds((Bounds) newValue);
-			return;
-		case DGPackage.RECTANGLE__CORNER_RADIUS:
-			setCornerRadius((Double) newValue);
-			return;
+			case DGPackage.RECTANGLE__BOUNDS:
+				setBounds((Bounds)newValue);
+				return;
+			case DGPackage.RECTANGLE__CORNER_RADIUS:
+				setCornerRadius((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.RECTANGLE__BOUNDS:
-			setBounds((Bounds) null);
-			return;
-		case DGPackage.RECTANGLE__CORNER_RADIUS:
-			unsetCornerRadius();
-			return;
+			case DGPackage.RECTANGLE__BOUNDS:
+				setBounds((Bounds)null);
+				return;
+			case DGPackage.RECTANGLE__CORNER_RADIUS:
+				unsetCornerRadius();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.RECTANGLE__BOUNDS:
-			return bounds != null;
-		case DGPackage.RECTANGLE__CORNER_RADIUS:
-			return isSetCornerRadius();
+			case DGPackage.RECTANGLE__BOUNDS:
+				return bounds != null;
+			case DGPackage.RECTANGLE__CORNER_RADIUS:
+				return isSetCornerRadius();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -336,29 +302,23 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP:
-			return nonNegativeCornerRadius((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP:
+				return nonNegativeCornerRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (cornerRadius: ");
-		if (cornerRadiusESet)
-			result.append(cornerRadius);
-		else
-			result.append("<unset>");
+		if (cornerRadiusESet) result.append(cornerRadius); else result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java
index 8ec85ae09ae..7919199c12a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
 import org.eclipse.emf.ecore.util.EObjectResolvingEList;
 
 import org.eclipse.papyrus.dd.dg.DGPackage;
@@ -38,24 +39,20 @@ import org.eclipse.papyrus.dd.dg.StyleSheet;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getBackgroundColor
- * <em>Background Color</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getDefinitions <em>
- * Definitions</em>}</li>
- * <li>
- * {@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getExternalStyleSheets
- * <em>External Style Sheet</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getBackgroundColor <em>Background Color</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getDefinitions <em>Definitions</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getExternalStyleSheets <em>External Style Sheet</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getScripts <em>Script</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	/**
-	 * The default value of the '{@link #getBackgroundColor()
-	 * <em>Background Color</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getBackgroundColor() <em>Background Color</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getBackgroundColor()
 	 * @generated
 	 * @ordered
@@ -63,10 +60,9 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	protected static final Color BACKGROUND_COLOR_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getBackgroundColor()
-	 * <em>Background Color</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getBackgroundColor() <em>Background Color</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getBackgroundColor()
 	 * @generated
 	 * @ordered
@@ -83,9 +79,8 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	protected boolean backgroundColorESet;
 
 	/**
-	 * The cached value of the '{@link #getDefinitions() <em>Definitions</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getDefinitions() <em>Definitions</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDefinitions()
 	 * @generated
 	 * @ordered
@@ -93,10 +88,9 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	protected Definitions definitions;
 
 	/**
-	 * The cached value of the '{@link #getExternalStyleSheets()
-	 * <em>External Style Sheet</em>}' reference list. <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getExternalStyleSheets() <em>External Style Sheet</em>}' reference list.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getExternalStyleSheets()
 	 * @generated
 	 * @ordered
@@ -104,8 +98,17 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	protected EList<StyleSheet> externalStyleSheets;
 
 	/**
+	 * The cached value of the '{@link #getScripts() <em>Script</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getScripts()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> scripts;
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected RootCanvasImpl() {
@@ -114,7 +117,6 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -124,7 +126,6 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Color getBackgroundColor() {
@@ -133,7 +134,6 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setBackgroundColor(Color newBackgroundColor) {
@@ -142,15 +142,11 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 		boolean oldBackgroundColorESet = backgroundColorESet;
 		backgroundColorESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.ROOT_CANVAS__BACKGROUND_COLOR,
-					oldBackgroundColor, backgroundColor,
-					!oldBackgroundColorESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ROOT_CANVAS__BACKGROUND_COLOR, oldBackgroundColor, backgroundColor, !oldBackgroundColorESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetBackgroundColor() {
@@ -159,15 +155,11 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 		backgroundColor = BACKGROUND_COLOR_EDEFAULT;
 		backgroundColorESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.ROOT_CANVAS__BACKGROUND_COLOR,
-					oldBackgroundColor, BACKGROUND_COLOR_EDEFAULT,
-					oldBackgroundColorESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.ROOT_CANVAS__BACKGROUND_COLOR, oldBackgroundColor, BACKGROUND_COLOR_EDEFAULT, oldBackgroundColorESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetBackgroundColor() {
@@ -176,7 +168,6 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Definitions getDefinitions() {
@@ -185,7 +176,6 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetDefinitions(Definitions newDefinitions,
@@ -193,171 +183,167 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 		Definitions oldDefinitions = definitions;
 		definitions = newDefinitions;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.ROOT_CANVAS__DEFINITIONS,
-					oldDefinitions, newDefinitions);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ROOT_CANVAS__DEFINITIONS, oldDefinitions, newDefinitions);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setDefinitions(Definitions newDefinitions) {
 		if (newDefinitions != definitions) {
 			NotificationChain msgs = null;
 			if (definitions != null)
-				msgs = ((InternalEObject) definitions).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.ROOT_CANVAS__DEFINITIONS, null,
-						msgs);
+				msgs = ((InternalEObject)definitions).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROOT_CANVAS__DEFINITIONS, null, msgs);
 			if (newDefinitions != null)
-				msgs = ((InternalEObject) newDefinitions).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DGPackage.ROOT_CANVAS__DEFINITIONS, null,
-						msgs);
+				msgs = ((InternalEObject)newDefinitions).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROOT_CANVAS__DEFINITIONS, null, msgs);
 			msgs = basicSetDefinitions(newDefinitions, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.ROOT_CANVAS__DEFINITIONS, newDefinitions,
-					newDefinitions));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ROOT_CANVAS__DEFINITIONS, newDefinitions, newDefinitions));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<StyleSheet> getExternalStyleSheets() {
 		if (externalStyleSheets == null) {
-			externalStyleSheets = new EObjectResolvingEList<StyleSheet>(
-					StyleSheet.class, this,
-					DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET);
+			externalStyleSheets = new EObjectResolvingEList<StyleSheet>(StyleSheet.class, this, DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET);
 		}
 		return externalStyleSheets;
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<String> getScripts() {
+		if (scripts == null) {
+			scripts = new EDataTypeUniqueEList<String>(String.class, this, DGPackage.ROOT_CANVAS__SCRIPT);
+		}
+		return scripts;
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.ROOT_CANVAS__DEFINITIONS:
-			return basicSetDefinitions(null, msgs);
+			case DGPackage.ROOT_CANVAS__DEFINITIONS:
+				return basicSetDefinitions(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
-			return getBackgroundColor();
-		case DGPackage.ROOT_CANVAS__DEFINITIONS:
-			return getDefinitions();
-		case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
-			return getExternalStyleSheets();
+			case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
+				return getBackgroundColor();
+			case DGPackage.ROOT_CANVAS__DEFINITIONS:
+				return getDefinitions();
+			case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
+				return getExternalStyleSheets();
+			case DGPackage.ROOT_CANVAS__SCRIPT:
+				return getScripts();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
-			setBackgroundColor((Color) newValue);
-			return;
-		case DGPackage.ROOT_CANVAS__DEFINITIONS:
-			setDefinitions((Definitions) newValue);
-			return;
-		case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
-			getExternalStyleSheets().clear();
-			getExternalStyleSheets().addAll(
-					(Collection<? extends StyleSheet>) newValue);
-			return;
+			case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
+				setBackgroundColor((Color)newValue);
+				return;
+			case DGPackage.ROOT_CANVAS__DEFINITIONS:
+				setDefinitions((Definitions)newValue);
+				return;
+			case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
+				getExternalStyleSheets().clear();
+				getExternalStyleSheets().addAll((Collection<? extends StyleSheet>)newValue);
+				return;
+			case DGPackage.ROOT_CANVAS__SCRIPT:
+				getScripts().clear();
+				getScripts().addAll((Collection<? extends String>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
-			unsetBackgroundColor();
-			return;
-		case DGPackage.ROOT_CANVAS__DEFINITIONS:
-			setDefinitions((Definitions) null);
-			return;
-		case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
-			getExternalStyleSheets().clear();
-			return;
+			case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
+				unsetBackgroundColor();
+				return;
+			case DGPackage.ROOT_CANVAS__DEFINITIONS:
+				setDefinitions((Definitions)null);
+				return;
+			case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
+				getExternalStyleSheets().clear();
+				return;
+			case DGPackage.ROOT_CANVAS__SCRIPT:
+				getScripts().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
-			return isSetBackgroundColor();
-		case DGPackage.ROOT_CANVAS__DEFINITIONS:
-			return definitions != null;
-		case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
-			return externalStyleSheets != null
-					&& !externalStyleSheets.isEmpty();
+			case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
+				return isSetBackgroundColor();
+			case DGPackage.ROOT_CANVAS__DEFINITIONS:
+				return definitions != null;
+			case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
+				return externalStyleSheets != null && !externalStyleSheets.isEmpty();
+			case DGPackage.ROOT_CANVAS__SCRIPT:
+				return scripts != null && !scripts.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (backgroundColor: ");
-		if (backgroundColorESet)
-			result.append(backgroundColor);
-		else
-			result.append("<unset>");
+		if (backgroundColorESet) result.append(backgroundColor); else result.append("<unset>");
+		result.append(", script: ");
+		result.append(scripts);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java
index 946a3c273a0..efced33cc57 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java
@@ -30,20 +30,17 @@ import org.eclipse.papyrus.dd.dg.Rotate;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.RotateImpl#getAngle <em>Angle</em>}
- * </li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.RotateImpl#getCenter <em>Center
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RotateImpl#getAngle <em>Angle</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RotateImpl#getCenter <em>Center</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class RotateImpl extends TransformImpl implements Rotate {
 	/**
 	 * The default value of the '{@link #getAngle() <em>Angle</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getAngle()
 	 * @generated
 	 * @ordered
@@ -53,7 +50,6 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	/**
 	 * The cached value of the '{@link #getAngle() <em>Angle</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getAngle()
 	 * @generated
 	 * @ordered
@@ -61,9 +57,8 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	protected double angle = ANGLE_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getCenter() <em>Center</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getCenter() <em>Center</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getCenter()
 	 * @generated
 	 * @ordered
@@ -72,7 +67,6 @@ public class RotateImpl extends TransformImpl implements Rotate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected RotateImpl() {
@@ -81,7 +75,6 @@ public class RotateImpl extends TransformImpl implements Rotate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -91,7 +84,6 @@ public class RotateImpl extends TransformImpl implements Rotate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getAngle() {
@@ -100,20 +92,17 @@ public class RotateImpl extends TransformImpl implements Rotate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setAngle(double newAngle) {
 		double oldAngle = angle;
 		angle = newAngle;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.ROTATE__ANGLE, oldAngle, angle));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ROTATE__ANGLE, oldAngle, angle));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getCenter() {
@@ -122,7 +111,6 @@ public class RotateImpl extends TransformImpl implements Rotate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetCenter(Point newCenter,
@@ -130,133 +118,115 @@ public class RotateImpl extends TransformImpl implements Rotate {
 		Point oldCenter = center;
 		center = newCenter;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.ROTATE__CENTER, oldCenter,
-					newCenter);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ROTATE__CENTER, oldCenter, newCenter);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setCenter(Point newCenter) {
 		if (newCenter != center) {
 			NotificationChain msgs = null;
 			if (center != null)
-				msgs = ((InternalEObject) center).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.ROTATE__CENTER,
-						null, msgs);
+				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROTATE__CENTER, null, msgs);
 			if (newCenter != null)
-				msgs = ((InternalEObject) newCenter).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.ROTATE__CENTER,
-						null, msgs);
+				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROTATE__CENTER, null, msgs);
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.ROTATE__CENTER, newCenter, newCenter));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ROTATE__CENTER, newCenter, newCenter));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.ROTATE__CENTER:
-			return basicSetCenter(null, msgs);
+			case DGPackage.ROTATE__CENTER:
+				return basicSetCenter(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.ROTATE__ANGLE:
-			return getAngle();
-		case DGPackage.ROTATE__CENTER:
-			return getCenter();
+			case DGPackage.ROTATE__ANGLE:
+				return getAngle();
+			case DGPackage.ROTATE__CENTER:
+				return getCenter();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.ROTATE__ANGLE:
-			setAngle((Double) newValue);
-			return;
-		case DGPackage.ROTATE__CENTER:
-			setCenter((Point) newValue);
-			return;
+			case DGPackage.ROTATE__ANGLE:
+				setAngle((Double)newValue);
+				return;
+			case DGPackage.ROTATE__CENTER:
+				setCenter((Point)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.ROTATE__ANGLE:
-			setAngle(ANGLE_EDEFAULT);
-			return;
-		case DGPackage.ROTATE__CENTER:
-			setCenter((Point) null);
-			return;
+			case DGPackage.ROTATE__ANGLE:
+				setAngle(ANGLE_EDEFAULT);
+				return;
+			case DGPackage.ROTATE__CENTER:
+				setCenter((Point)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.ROTATE__ANGLE:
-			return angle != ANGLE_EDEFAULT;
-		case DGPackage.ROTATE__CENTER:
-			return center != null;
+			case DGPackage.ROTATE__ANGLE:
+				return angle != ANGLE_EDEFAULT;
+			case DGPackage.ROTATE__CENTER:
+				return center != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (angle: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java
index 44e4068ef11..fdfb690e5b5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java
@@ -36,20 +36,17 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl#getFactorX <em>Factor X
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl#getFactorY <em>Factor Y
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl#getFactorX <em>Factor X</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl#getFactorY <em>Factor Y</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class ScaleImpl extends TransformImpl implements Scale {
 	/**
-	 * The default value of the '{@link #getFactorX() <em>Factor X</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getFactorX() <em>Factor X</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFactorX()
 	 * @generated
 	 * @ordered
@@ -57,9 +54,8 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	protected static final double FACTOR_X_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getFactorX() <em>Factor X</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getFactorX() <em>Factor X</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFactorX()
 	 * @generated
 	 * @ordered
@@ -67,9 +63,8 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	protected double factorX = FACTOR_X_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getFactorY() <em>Factor Y</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getFactorY() <em>Factor Y</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFactorY()
 	 * @generated
 	 * @ordered
@@ -77,9 +72,8 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	protected static final double FACTOR_Y_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getFactorY() <em>Factor Y</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getFactorY() <em>Factor Y</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFactorY()
 	 * @generated
 	 * @ordered
@@ -88,7 +82,6 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected ScaleImpl() {
@@ -97,7 +90,6 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -107,7 +99,6 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getFactorX() {
@@ -116,20 +107,17 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setFactorX(double newFactorX) {
 		double oldFactorX = factorX;
 		factorX = newFactorX;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.SCALE__FACTOR_X, oldFactorX, factorX));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SCALE__FACTOR_X, oldFactorX, factorX));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getFactorY() {
@@ -138,25 +126,20 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setFactorY(double newFactorY) {
 		double oldFactorY = factorY;
 		factorY = newFactorY;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.SCALE__FACTOR_Y, oldFactorY, factorY));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SCALE__FACTOR_Y, oldFactorY, factorY));
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Nonnegativescale</em>}' invariant operation. <!-- begin-user-doc -->
+	 * The cached validation expression for the '{@link #nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Nonnegativescale</em>}' invariant operation.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @see #nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -164,95 +147,90 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean nonnegativescale(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.SCALE,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP,
-						NONNEGATIVESCALE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.SCALE__NONNEGATIVESCALE);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.SCALE,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP,
+				 NONNEGATIVESCALE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.SCALE__NONNEGATIVESCALE);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.SCALE__FACTOR_X:
-			return getFactorX();
-		case DGPackage.SCALE__FACTOR_Y:
-			return getFactorY();
+			case DGPackage.SCALE__FACTOR_X:
+				return getFactorX();
+			case DGPackage.SCALE__FACTOR_Y:
+				return getFactorY();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.SCALE__FACTOR_X:
-			setFactorX((Double) newValue);
-			return;
-		case DGPackage.SCALE__FACTOR_Y:
-			setFactorY((Double) newValue);
-			return;
+			case DGPackage.SCALE__FACTOR_X:
+				setFactorX((Double)newValue);
+				return;
+			case DGPackage.SCALE__FACTOR_Y:
+				setFactorY((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.SCALE__FACTOR_X:
-			setFactorX(FACTOR_X_EDEFAULT);
-			return;
-		case DGPackage.SCALE__FACTOR_Y:
-			setFactorY(FACTOR_Y_EDEFAULT);
-			return;
+			case DGPackage.SCALE__FACTOR_X:
+				setFactorX(FACTOR_X_EDEFAULT);
+				return;
+			case DGPackage.SCALE__FACTOR_Y:
+				setFactorY(FACTOR_Y_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.SCALE__FACTOR_X:
-			return factorX != FACTOR_X_EDEFAULT;
-		case DGPackage.SCALE__FACTOR_Y:
-			return factorY != FACTOR_Y_EDEFAULT;
+			case DGPackage.SCALE__FACTOR_X:
+				return factorX != FACTOR_X_EDEFAULT;
+			case DGPackage.SCALE__FACTOR_Y:
+				return factorY != FACTOR_Y_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -260,22 +238,19 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP:
-			return nonnegativescale((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP:
+				return nonnegativescale((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (factorX: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java
index 7d7dd9ad90c..08eeb65152b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java
@@ -26,20 +26,17 @@ import org.eclipse.papyrus.dd.dg.Skew;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.SkewImpl#getAngleX <em>Angle X
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.SkewImpl#getAngleY <em>Angle Y
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.SkewImpl#getAngleX <em>Angle X</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.SkewImpl#getAngleY <em>Angle Y</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class SkewImpl extends TransformImpl implements Skew {
 	/**
-	 * The default value of the '{@link #getAngleX() <em>Angle X</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getAngleX() <em>Angle X</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getAngleX()
 	 * @generated
 	 * @ordered
@@ -47,9 +44,8 @@ public class SkewImpl extends TransformImpl implements Skew {
 	protected static final double ANGLE_X_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getAngleX() <em>Angle X</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getAngleX() <em>Angle X</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getAngleX()
 	 * @generated
 	 * @ordered
@@ -57,9 +53,8 @@ public class SkewImpl extends TransformImpl implements Skew {
 	protected double angleX = ANGLE_X_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getAngleY() <em>Angle Y</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getAngleY() <em>Angle Y</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getAngleY()
 	 * @generated
 	 * @ordered
@@ -67,9 +62,8 @@ public class SkewImpl extends TransformImpl implements Skew {
 	protected static final double ANGLE_Y_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getAngleY() <em>Angle Y</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getAngleY() <em>Angle Y</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getAngleY()
 	 * @generated
 	 * @ordered
@@ -78,7 +72,6 @@ public class SkewImpl extends TransformImpl implements Skew {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected SkewImpl() {
@@ -87,7 +80,6 @@ public class SkewImpl extends TransformImpl implements Skew {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,7 +89,6 @@ public class SkewImpl extends TransformImpl implements Skew {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getAngleX() {
@@ -106,20 +97,17 @@ public class SkewImpl extends TransformImpl implements Skew {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setAngleX(double newAngleX) {
 		double oldAngleX = angleX;
 		angleX = newAngleX;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.SKEW__ANGLE_X, oldAngleX, angleX));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SKEW__ANGLE_X, oldAngleX, angleX));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getAngleY() {
@@ -128,94 +116,86 @@ public class SkewImpl extends TransformImpl implements Skew {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setAngleY(double newAngleY) {
 		double oldAngleY = angleY;
 		angleY = newAngleY;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.SKEW__ANGLE_Y, oldAngleY, angleY));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SKEW__ANGLE_Y, oldAngleY, angleY));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.SKEW__ANGLE_X:
-			return getAngleX();
-		case DGPackage.SKEW__ANGLE_Y:
-			return getAngleY();
+			case DGPackage.SKEW__ANGLE_X:
+				return getAngleX();
+			case DGPackage.SKEW__ANGLE_Y:
+				return getAngleY();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.SKEW__ANGLE_X:
-			setAngleX((Double) newValue);
-			return;
-		case DGPackage.SKEW__ANGLE_Y:
-			setAngleY((Double) newValue);
-			return;
+			case DGPackage.SKEW__ANGLE_X:
+				setAngleX((Double)newValue);
+				return;
+			case DGPackage.SKEW__ANGLE_Y:
+				setAngleY((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.SKEW__ANGLE_X:
-			setAngleX(ANGLE_X_EDEFAULT);
-			return;
-		case DGPackage.SKEW__ANGLE_Y:
-			setAngleY(ANGLE_Y_EDEFAULT);
-			return;
+			case DGPackage.SKEW__ANGLE_X:
+				setAngleX(ANGLE_X_EDEFAULT);
+				return;
+			case DGPackage.SKEW__ANGLE_Y:
+				setAngleY(ANGLE_Y_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.SKEW__ANGLE_X:
-			return angleX != ANGLE_X_EDEFAULT;
-		case DGPackage.SKEW__ANGLE_Y:
-			return angleY != ANGLE_Y_EDEFAULT;
+			case DGPackage.SKEW__ANGLE_X:
+				return angleX != ANGLE_X_EDEFAULT;
+			case DGPackage.SKEW__ANGLE_Y:
+				return angleY != ANGLE_Y_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (angleX: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java
index 8dcf529962d..022c74814bf 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java
@@ -45,37 +45,26 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFill <em>Fill</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFillOpacity <em>Fill
- * Opacity</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStroke <em>Stroke
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeWidth <em>Stroke
- * Width</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeOpacity <em>
- * Stroke Opacity</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeDashLengths <em>
- * Stroke Dash Length</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontSize <em>Font Size
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontName <em>Font Name
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#isFontItalic <em>Font
- * Italic</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#isFontBold <em>Font Bold
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontDecoration <em>
- * Font Decoration</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFill <em>Fill</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFillOpacity <em>Fill Opacity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStroke <em>Stroke</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeWidth <em>Stroke Width</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeOpacity <em>Stroke Opacity</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeDashLengths <em>Stroke Dash Length</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontSize <em>Font Size</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontName <em>Font Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#isFontItalic <em>Font Italic</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#isFontBold <em>Font Bold</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontDecoration <em>Font Decoration</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
-	 * The cached value of the '{@link #getFill() <em>Fill</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getFill() <em>Fill</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFill()
 	 * @generated
 	 * @ordered
@@ -92,9 +81,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected boolean fillESet;
 
 	/**
-	 * The default value of the '{@link #getFillOpacity() <em>Fill Opacity</em>}
-	 * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getFillOpacity() <em>Fill Opacity</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFillOpacity()
 	 * @generated
 	 * @ordered
@@ -102,9 +90,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected static final double FILL_OPACITY_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getFillOpacity() <em>Fill Opacity</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getFillOpacity() <em>Fill Opacity</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFillOpacity()
 	 * @generated
 	 * @ordered
@@ -121,9 +108,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected boolean fillOpacityESet;
 
 	/**
-	 * The cached value of the '{@link #getStroke() <em>Stroke</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getStroke() <em>Stroke</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getStroke()
 	 * @generated
 	 * @ordered
@@ -140,9 +126,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected boolean strokeESet;
 
 	/**
-	 * The default value of the '{@link #getStrokeWidth() <em>Stroke Width</em>}
-	 * ' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getStrokeWidth() <em>Stroke Width</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getStrokeWidth()
 	 * @generated
 	 * @ordered
@@ -150,9 +135,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected static final double STROKE_WIDTH_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getStrokeWidth() <em>Stroke Width</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getStrokeWidth() <em>Stroke Width</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getStrokeWidth()
 	 * @generated
 	 * @ordered
@@ -169,10 +153,9 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected boolean strokeWidthESet;
 
 	/**
-	 * The default value of the '{@link #getStrokeOpacity()
-	 * <em>Stroke Opacity</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getStrokeOpacity() <em>Stroke Opacity</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getStrokeOpacity()
 	 * @generated
 	 * @ordered
@@ -180,10 +163,9 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected static final double STROKE_OPACITY_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getStrokeOpacity()
-	 * <em>Stroke Opacity</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getStrokeOpacity() <em>Stroke Opacity</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getStrokeOpacity()
 	 * @generated
 	 * @ordered
@@ -200,10 +182,9 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected boolean strokeOpacityESet;
 
 	/**
-	 * The cached value of the '{@link #getStrokeDashLengths()
-	 * <em>Stroke Dash Length</em>}' attribute list. <!-- begin-user-doc -->
+	 * The cached value of the '{@link #getStrokeDashLengths() <em>Stroke Dash Length</em>}' attribute list.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @see #getStrokeDashLengths()
 	 * @generated
 	 * @ordered
@@ -211,9 +192,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected EList<Double> strokeDashLengths;
 
 	/**
-	 * The default value of the '{@link #getFontSize() <em>Font Size</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getFontSize() <em>Font Size</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFontSize()
 	 * @generated
 	 * @ordered
@@ -221,9 +201,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected static final double FONT_SIZE_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getFontSize() <em>Font Size</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getFontSize() <em>Font Size</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFontSize()
 	 * @generated
 	 * @ordered
@@ -231,18 +210,17 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected double fontSize = FONT_SIZE_EDEFAULT;
 
 	/**
-	 * This is true if the Font Size attribute has been set. <!-- begin-user-doc
+	 * This is true if the Font Size attribute has been set.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean fontSizeESet;
 
 	/**
-	 * The default value of the '{@link #getFontName() <em>Font Name</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFontName()
 	 * @generated
 	 * @ordered
@@ -250,9 +228,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected static final String FONT_NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getFontName()
 	 * @generated
 	 * @ordered
@@ -260,18 +237,17 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected String fontName = FONT_NAME_EDEFAULT;
 
 	/**
-	 * This is true if the Font Name attribute has been set. <!-- begin-user-doc
+	 * This is true if the Font Name attribute has been set.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean fontNameESet;
 
 	/**
-	 * The default value of the '{@link #isFontItalic() <em>Font Italic</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #isFontItalic() <em>Font Italic</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isFontItalic()
 	 * @generated
 	 * @ordered
@@ -279,9 +255,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected static final boolean FONT_ITALIC_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isFontItalic() <em>Font Italic</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #isFontItalic() <em>Font Italic</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isFontItalic()
 	 * @generated
 	 * @ordered
@@ -298,9 +273,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected boolean fontItalicESet;
 
 	/**
-	 * The default value of the '{@link #isFontBold() <em>Font Bold</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #isFontBold() <em>Font Bold</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isFontBold()
 	 * @generated
 	 * @ordered
@@ -308,9 +282,8 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected static final boolean FONT_BOLD_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isFontBold() <em>Font Bold</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #isFontBold() <em>Font Bold</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #isFontBold()
 	 * @generated
 	 * @ordered
@@ -318,19 +291,18 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected boolean fontBold = FONT_BOLD_EDEFAULT;
 
 	/**
-	 * This is true if the Font Bold attribute has been set. <!-- begin-user-doc
+	 * This is true if the Font Bold attribute has been set.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean fontBoldESet;
 
 	/**
-	 * The default value of the '{@link #getFontDecoration()
-	 * <em>Font Decoration</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getFontDecoration() <em>Font Decoration</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getFontDecoration()
 	 * @generated
 	 * @ordered
@@ -338,10 +310,9 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	protected static final FontDecoration FONT_DECORATION_EDEFAULT = FontDecoration.UNDERLINE;
 
 	/**
-	 * The cached value of the '{@link #getFontDecoration()
-	 * <em>Font Decoration</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getFontDecoration() <em>Font Decoration</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getFontDecoration()
 	 * @generated
 	 * @ordered
@@ -359,7 +330,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected StyleImpl() {
@@ -368,7 +338,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -378,7 +347,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Paint getFill() {
@@ -387,7 +355,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetFill(Paint newFill, NotificationChain msgs) {
@@ -396,48 +363,36 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFillESet = fillESet;
 		fillESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.STYLE__FILL, oldFill, newFill,
-					!oldFillESet);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FILL, oldFill, newFill, !oldFillESet);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setFill(Paint newFill) {
 		if (newFill != fill) {
 			NotificationChain msgs = null;
 			if (fill != null)
-				msgs = ((InternalEObject) fill).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null,
-						msgs);
+				msgs = ((InternalEObject)fill).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
 			if (newFill != null)
-				msgs = ((InternalEObject) newFill).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null,
-						msgs);
+				msgs = ((InternalEObject)newFill).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
 			msgs = basicSetFill(newFill, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else {
+			if (msgs != null) msgs.dispatch();
+		}
+		else {
 			boolean oldFillESet = fillESet;
 			fillESet = true;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET,
-						DGPackage.STYLE__FILL, newFill, newFill, !oldFillESet));
+				eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FILL, newFill, newFill, !oldFillESet));
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetFill(NotificationChain msgs) {
@@ -446,42 +401,33 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFillESet = fillESet;
 		fillESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.UNSET, DGPackage.STYLE__FILL, oldFill, null,
-					oldFillESet);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FILL, oldFill, null, oldFillESet);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetFill() {
 		if (fill != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject) fill).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
+			msgs = ((InternalEObject)fill).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
 			msgs = basicUnsetFill(msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else {
+			if (msgs != null) msgs.dispatch();
+		}
+		else {
 			boolean oldFillESet = fillESet;
 			fillESet = false;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.UNSET,
-						DGPackage.STYLE__FILL, null, null, oldFillESet));
+				eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FILL, null, null, oldFillESet));
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetFill() {
@@ -490,7 +436,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getFillOpacity() {
@@ -499,7 +444,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setFillOpacity(double newFillOpacity) {
@@ -508,14 +452,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFillOpacityESet = fillOpacityESet;
 		fillOpacityESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.STYLE__FILL_OPACITY, oldFillOpacity, fillOpacity,
-					!oldFillOpacityESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FILL_OPACITY, oldFillOpacity, fillOpacity, !oldFillOpacityESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetFillOpacity() {
@@ -524,14 +465,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fillOpacity = FILL_OPACITY_EDEFAULT;
 		fillOpacityESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.STYLE__FILL_OPACITY, oldFillOpacity,
-					FILL_OPACITY_EDEFAULT, oldFillOpacityESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FILL_OPACITY, oldFillOpacity, FILL_OPACITY_EDEFAULT, oldFillOpacityESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetFillOpacity() {
@@ -540,7 +478,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Paint getStroke() {
@@ -549,7 +486,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetStroke(Paint newStroke,
@@ -559,49 +495,36 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldStrokeESet = strokeESet;
 		strokeESet = true;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.STYLE__STROKE, oldStroke,
-					newStroke, !oldStrokeESet);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__STROKE, oldStroke, newStroke, !oldStrokeESet);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setStroke(Paint newStroke) {
 		if (newStroke != stroke) {
 			NotificationChain msgs = null;
 			if (stroke != null)
-				msgs = ((InternalEObject) stroke).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null,
-						msgs);
+				msgs = ((InternalEObject)stroke).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null, msgs);
 			if (newStroke != null)
-				msgs = ((InternalEObject) newStroke).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null,
-						msgs);
+				msgs = ((InternalEObject)newStroke).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null, msgs);
 			msgs = basicSetStroke(newStroke, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else {
+			if (msgs != null) msgs.dispatch();
+		}
+		else {
 			boolean oldStrokeESet = strokeESet;
 			strokeESet = true;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.SET,
-						DGPackage.STYLE__STROKE, newStroke, newStroke,
-						!oldStrokeESet));
+				eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__STROKE, newStroke, newStroke, !oldStrokeESet));
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetStroke(NotificationChain msgs) {
@@ -610,43 +533,33 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldStrokeESet = strokeESet;
 		strokeESet = false;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.UNSET, DGPackage.STYLE__STROKE, oldStroke,
-					null, oldStrokeESet);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__STROKE, oldStroke, null, oldStrokeESet);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetStroke() {
 		if (stroke != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject) stroke).eInverseRemove(this,
-					EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null,
-					msgs);
+			msgs = ((InternalEObject)stroke).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null, msgs);
 			msgs = basicUnsetStroke(msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else {
+			if (msgs != null) msgs.dispatch();
+		}
+		else {
 			boolean oldStrokeESet = strokeESet;
 			strokeESet = false;
 			if (eNotificationRequired())
-				eNotify(new ENotificationImpl(this, Notification.UNSET,
-						DGPackage.STYLE__STROKE, null, null, oldStrokeESet));
+				eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__STROKE, null, null, oldStrokeESet));
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetStroke() {
@@ -655,7 +568,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getStrokeWidth() {
@@ -664,7 +576,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setStrokeWidth(double newStrokeWidth) {
@@ -673,14 +584,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldStrokeWidthESet = strokeWidthESet;
 		strokeWidthESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.STYLE__STROKE_WIDTH, oldStrokeWidth, strokeWidth,
-					!oldStrokeWidthESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__STROKE_WIDTH, oldStrokeWidth, strokeWidth, !oldStrokeWidthESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetStrokeWidth() {
@@ -689,14 +597,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		strokeWidth = STROKE_WIDTH_EDEFAULT;
 		strokeWidthESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.STYLE__STROKE_WIDTH, oldStrokeWidth,
-					STROKE_WIDTH_EDEFAULT, oldStrokeWidthESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__STROKE_WIDTH, oldStrokeWidth, STROKE_WIDTH_EDEFAULT, oldStrokeWidthESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetStrokeWidth() {
@@ -705,7 +610,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getStrokeOpacity() {
@@ -714,7 +618,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setStrokeOpacity(double newStrokeOpacity) {
@@ -723,14 +626,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldStrokeOpacityESet = strokeOpacityESet;
 		strokeOpacityESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.STYLE__STROKE_OPACITY, oldStrokeOpacity,
-					strokeOpacity, !oldStrokeOpacityESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__STROKE_OPACITY, oldStrokeOpacity, strokeOpacity, !oldStrokeOpacityESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetStrokeOpacity() {
@@ -739,14 +639,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		strokeOpacity = STROKE_OPACITY_EDEFAULT;
 		strokeOpacityESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.STYLE__STROKE_OPACITY, oldStrokeOpacity,
-					STROKE_OPACITY_EDEFAULT, oldStrokeOpacityESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__STROKE_OPACITY, oldStrokeOpacity, STROKE_OPACITY_EDEFAULT, oldStrokeOpacityESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetStrokeOpacity() {
@@ -755,40 +652,33 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<Double> getStrokeDashLengths() {
 		if (strokeDashLengths == null) {
-			strokeDashLengths = new EDataTypeEList.Unsettable<Double>(
-					Double.class, this, DGPackage.STYLE__STROKE_DASH_LENGTH);
+			strokeDashLengths = new EDataTypeEList.Unsettable<Double>(Double.class, this, DGPackage.STYLE__STROKE_DASH_LENGTH);
 		}
 		return strokeDashLengths;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetStrokeDashLengths() {
-		if (strokeDashLengths != null)
-			((InternalEList.Unsettable<?>) strokeDashLengths).unset();
+		if (strokeDashLengths != null) ((InternalEList.Unsettable<?>)strokeDashLengths).unset();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetStrokeDashLengths() {
-		return strokeDashLengths != null
-				&& ((InternalEList.Unsettable<?>) strokeDashLengths).isSet();
+		return strokeDashLengths != null && ((InternalEList.Unsettable<?>)strokeDashLengths).isSet();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getFontSize() {
@@ -797,7 +687,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setFontSize(double newFontSize) {
@@ -806,14 +695,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontSizeESet = fontSizeESet;
 		fontSizeESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.STYLE__FONT_SIZE, oldFontSize, fontSize,
-					!oldFontSizeESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_SIZE, oldFontSize, fontSize, !oldFontSizeESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetFontSize() {
@@ -822,14 +708,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontSize = FONT_SIZE_EDEFAULT;
 		fontSizeESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.STYLE__FONT_SIZE, oldFontSize,
-					FONT_SIZE_EDEFAULT, oldFontSizeESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_SIZE, oldFontSize, FONT_SIZE_EDEFAULT, oldFontSizeESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetFontSize() {
@@ -838,7 +721,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getFontName() {
@@ -847,7 +729,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setFontName(String newFontName) {
@@ -856,14 +737,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontNameESet = fontNameESet;
 		fontNameESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.STYLE__FONT_NAME, oldFontName, fontName,
-					!oldFontNameESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_NAME, oldFontName, fontName, !oldFontNameESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetFontName() {
@@ -872,14 +750,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontName = FONT_NAME_EDEFAULT;
 		fontNameESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.STYLE__FONT_NAME, oldFontName,
-					FONT_NAME_EDEFAULT, oldFontNameESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_NAME, oldFontName, FONT_NAME_EDEFAULT, oldFontNameESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetFontName() {
@@ -888,7 +763,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isFontItalic() {
@@ -897,7 +771,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setFontItalic(boolean newFontItalic) {
@@ -906,14 +779,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontItalicESet = fontItalicESet;
 		fontItalicESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.STYLE__FONT_ITALIC, oldFontItalic, fontItalic,
-					!oldFontItalicESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_ITALIC, oldFontItalic, fontItalic, !oldFontItalicESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetFontItalic() {
@@ -922,14 +792,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontItalic = FONT_ITALIC_EDEFAULT;
 		fontItalicESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.STYLE__FONT_ITALIC, oldFontItalic,
-					FONT_ITALIC_EDEFAULT, oldFontItalicESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_ITALIC, oldFontItalic, FONT_ITALIC_EDEFAULT, oldFontItalicESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetFontItalic() {
@@ -938,7 +805,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isFontBold() {
@@ -947,7 +813,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setFontBold(boolean newFontBold) {
@@ -956,14 +821,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontBoldESet = fontBoldESet;
 		fontBoldESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.STYLE__FONT_BOLD, oldFontBold, fontBold,
-					!oldFontBoldESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_BOLD, oldFontBold, fontBold, !oldFontBoldESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetFontBold() {
@@ -972,14 +834,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontBold = FONT_BOLD_EDEFAULT;
 		fontBoldESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.STYLE__FONT_BOLD, oldFontBold,
-					FONT_BOLD_EDEFAULT, oldFontBoldESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_BOLD, oldFontBold, FONT_BOLD_EDEFAULT, oldFontBoldESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetFontBold() {
@@ -988,7 +847,6 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public FontDecoration getFontDecoration() {
@@ -997,24 +855,19 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setFontDecoration(FontDecoration newFontDecoration) {
 		FontDecoration oldFontDecoration = fontDecoration;
-		fontDecoration = newFontDecoration == null ? FONT_DECORATION_EDEFAULT
-				: newFontDecoration;
+		fontDecoration = newFontDecoration == null ? FONT_DECORATION_EDEFAULT : newFontDecoration;
 		boolean oldFontDecorationESet = fontDecorationESet;
 		fontDecorationESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.STYLE__FONT_DECORATION, oldFontDecoration,
-					fontDecoration, !oldFontDecorationESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_DECORATION, oldFontDecoration, fontDecoration, !oldFontDecorationESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetFontDecoration() {
@@ -1023,14 +876,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontDecoration = FONT_DECORATION_EDEFAULT;
 		fontDecorationESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.STYLE__FONT_DECORATION, oldFontDecoration,
-					FONT_DECORATION_EDEFAULT, oldFontDecorationESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_DECORATION, oldFontDecoration, FONT_DECORATION_EDEFAULT, oldFontDecorationESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetFontDecoration() {
@@ -1038,13 +888,10 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Font Size</em>}' invariant operation. <!-- begin-user-doc -->
+	 * The cached validation expression for the '{@link #validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Font Size</em>}' invariant operation.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @see #validFontSize(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -1052,32 +899,29 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validFontSize(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.STYLE,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP,
-						VALID_FONT_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.STYLE__VALID_FONT_SIZE);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.STYLE,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP,
+				 VALID_FONT_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.STYLE__VALID_FONT_SIZE);
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Fill Opacity</em>}' invariant operation. <!-- begin-user-doc
+	 * The cached validation expression for the '{@link #validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Fill Opacity</em>}' invariant operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -1085,32 +929,29 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validFillOpacity(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.STYLE,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP,
-						VALID_FILL_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.STYLE__VALID_FILL_OPACITY);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.STYLE,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP,
+				 VALID_FILL_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.STYLE__VALID_FILL_OPACITY);
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Stroke Width</em>}' invariant operation. <!-- begin-user-doc
+	 * The cached validation expression for the '{@link #validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Stroke Width</em>}' invariant operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -1118,22 +959,22 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validStrokeWidth(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.STYLE,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP,
-						VALID_STROKE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.STYLE__VALID_STROKE_WIDTH);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.STYLE,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP,
+				 VALID_STROKE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.STYLE__VALID_STROKE_WIDTH);
 	}
 
 	/**
@@ -1151,32 +992,29 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validDashLengthSize(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.STYLE,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP,
-						VALID_DASH_LENGTH_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.STYLE__VALID_DASH_LENGTH_SIZE);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.STYLE,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP,
+				 VALID_DASH_LENGTH_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.STYLE__VALID_DASH_LENGTH_SIZE);
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Valid Stroke Opacity</em>}' invariant operation. <!-- begin-user-doc
+	 * The cached validation expression for the '{@link #validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Stroke Opacity</em>}' invariant operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -1184,205 +1022,198 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validStrokeOpacity(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.STYLE,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP,
-						VALID_STROKE_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.STYLE__VALID_STROKE_OPACITY);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.STYLE,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP,
+				 VALID_STROKE_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.STYLE__VALID_STROKE_OPACITY);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.STYLE__FILL:
-			return basicUnsetFill(msgs);
-		case DGPackage.STYLE__STROKE:
-			return basicUnsetStroke(msgs);
+			case DGPackage.STYLE__FILL:
+				return basicUnsetFill(msgs);
+			case DGPackage.STYLE__STROKE:
+				return basicUnsetStroke(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.STYLE__FILL:
-			return getFill();
-		case DGPackage.STYLE__FILL_OPACITY:
-			return getFillOpacity();
-		case DGPackage.STYLE__STROKE:
-			return getStroke();
-		case DGPackage.STYLE__STROKE_WIDTH:
-			return getStrokeWidth();
-		case DGPackage.STYLE__STROKE_OPACITY:
-			return getStrokeOpacity();
-		case DGPackage.STYLE__STROKE_DASH_LENGTH:
-			return getStrokeDashLengths();
-		case DGPackage.STYLE__FONT_SIZE:
-			return getFontSize();
-		case DGPackage.STYLE__FONT_NAME:
-			return getFontName();
-		case DGPackage.STYLE__FONT_ITALIC:
-			return isFontItalic();
-		case DGPackage.STYLE__FONT_BOLD:
-			return isFontBold();
-		case DGPackage.STYLE__FONT_DECORATION:
-			return getFontDecoration();
+			case DGPackage.STYLE__FILL:
+				return getFill();
+			case DGPackage.STYLE__FILL_OPACITY:
+				return getFillOpacity();
+			case DGPackage.STYLE__STROKE:
+				return getStroke();
+			case DGPackage.STYLE__STROKE_WIDTH:
+				return getStrokeWidth();
+			case DGPackage.STYLE__STROKE_OPACITY:
+				return getStrokeOpacity();
+			case DGPackage.STYLE__STROKE_DASH_LENGTH:
+				return getStrokeDashLengths();
+			case DGPackage.STYLE__FONT_SIZE:
+				return getFontSize();
+			case DGPackage.STYLE__FONT_NAME:
+				return getFontName();
+			case DGPackage.STYLE__FONT_ITALIC:
+				return isFontItalic();
+			case DGPackage.STYLE__FONT_BOLD:
+				return isFontBold();
+			case DGPackage.STYLE__FONT_DECORATION:
+				return getFontDecoration();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.STYLE__FILL:
-			setFill((Paint) newValue);
-			return;
-		case DGPackage.STYLE__FILL_OPACITY:
-			setFillOpacity((Double) newValue);
-			return;
-		case DGPackage.STYLE__STROKE:
-			setStroke((Paint) newValue);
-			return;
-		case DGPackage.STYLE__STROKE_WIDTH:
-			setStrokeWidth((Double) newValue);
-			return;
-		case DGPackage.STYLE__STROKE_OPACITY:
-			setStrokeOpacity((Double) newValue);
-			return;
-		case DGPackage.STYLE__STROKE_DASH_LENGTH:
-			getStrokeDashLengths().clear();
-			getStrokeDashLengths().addAll(
-					(Collection<? extends Double>) newValue);
-			return;
-		case DGPackage.STYLE__FONT_SIZE:
-			setFontSize((Double) newValue);
-			return;
-		case DGPackage.STYLE__FONT_NAME:
-			setFontName((String) newValue);
-			return;
-		case DGPackage.STYLE__FONT_ITALIC:
-			setFontItalic((Boolean) newValue);
-			return;
-		case DGPackage.STYLE__FONT_BOLD:
-			setFontBold((Boolean) newValue);
-			return;
-		case DGPackage.STYLE__FONT_DECORATION:
-			setFontDecoration((FontDecoration) newValue);
-			return;
+			case DGPackage.STYLE__FILL:
+				setFill((Paint)newValue);
+				return;
+			case DGPackage.STYLE__FILL_OPACITY:
+				setFillOpacity((Double)newValue);
+				return;
+			case DGPackage.STYLE__STROKE:
+				setStroke((Paint)newValue);
+				return;
+			case DGPackage.STYLE__STROKE_WIDTH:
+				setStrokeWidth((Double)newValue);
+				return;
+			case DGPackage.STYLE__STROKE_OPACITY:
+				setStrokeOpacity((Double)newValue);
+				return;
+			case DGPackage.STYLE__STROKE_DASH_LENGTH:
+				getStrokeDashLengths().clear();
+				getStrokeDashLengths().addAll((Collection<? extends Double>)newValue);
+				return;
+			case DGPackage.STYLE__FONT_SIZE:
+				setFontSize((Double)newValue);
+				return;
+			case DGPackage.STYLE__FONT_NAME:
+				setFontName((String)newValue);
+				return;
+			case DGPackage.STYLE__FONT_ITALIC:
+				setFontItalic((Boolean)newValue);
+				return;
+			case DGPackage.STYLE__FONT_BOLD:
+				setFontBold((Boolean)newValue);
+				return;
+			case DGPackage.STYLE__FONT_DECORATION:
+				setFontDecoration((FontDecoration)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.STYLE__FILL:
-			unsetFill();
-			return;
-		case DGPackage.STYLE__FILL_OPACITY:
-			unsetFillOpacity();
-			return;
-		case DGPackage.STYLE__STROKE:
-			unsetStroke();
-			return;
-		case DGPackage.STYLE__STROKE_WIDTH:
-			unsetStrokeWidth();
-			return;
-		case DGPackage.STYLE__STROKE_OPACITY:
-			unsetStrokeOpacity();
-			return;
-		case DGPackage.STYLE__STROKE_DASH_LENGTH:
-			unsetStrokeDashLengths();
-			return;
-		case DGPackage.STYLE__FONT_SIZE:
-			unsetFontSize();
-			return;
-		case DGPackage.STYLE__FONT_NAME:
-			unsetFontName();
-			return;
-		case DGPackage.STYLE__FONT_ITALIC:
-			unsetFontItalic();
-			return;
-		case DGPackage.STYLE__FONT_BOLD:
-			unsetFontBold();
-			return;
-		case DGPackage.STYLE__FONT_DECORATION:
-			unsetFontDecoration();
-			return;
+			case DGPackage.STYLE__FILL:
+				unsetFill();
+				return;
+			case DGPackage.STYLE__FILL_OPACITY:
+				unsetFillOpacity();
+				return;
+			case DGPackage.STYLE__STROKE:
+				unsetStroke();
+				return;
+			case DGPackage.STYLE__STROKE_WIDTH:
+				unsetStrokeWidth();
+				return;
+			case DGPackage.STYLE__STROKE_OPACITY:
+				unsetStrokeOpacity();
+				return;
+			case DGPackage.STYLE__STROKE_DASH_LENGTH:
+				unsetStrokeDashLengths();
+				return;
+			case DGPackage.STYLE__FONT_SIZE:
+				unsetFontSize();
+				return;
+			case DGPackage.STYLE__FONT_NAME:
+				unsetFontName();
+				return;
+			case DGPackage.STYLE__FONT_ITALIC:
+				unsetFontItalic();
+				return;
+			case DGPackage.STYLE__FONT_BOLD:
+				unsetFontBold();
+				return;
+			case DGPackage.STYLE__FONT_DECORATION:
+				unsetFontDecoration();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.STYLE__FILL:
-			return isSetFill();
-		case DGPackage.STYLE__FILL_OPACITY:
-			return isSetFillOpacity();
-		case DGPackage.STYLE__STROKE:
-			return isSetStroke();
-		case DGPackage.STYLE__STROKE_WIDTH:
-			return isSetStrokeWidth();
-		case DGPackage.STYLE__STROKE_OPACITY:
-			return isSetStrokeOpacity();
-		case DGPackage.STYLE__STROKE_DASH_LENGTH:
-			return isSetStrokeDashLengths();
-		case DGPackage.STYLE__FONT_SIZE:
-			return isSetFontSize();
-		case DGPackage.STYLE__FONT_NAME:
-			return isSetFontName();
-		case DGPackage.STYLE__FONT_ITALIC:
-			return isSetFontItalic();
-		case DGPackage.STYLE__FONT_BOLD:
-			return isSetFontBold();
-		case DGPackage.STYLE__FONT_DECORATION:
-			return isSetFontDecoration();
+			case DGPackage.STYLE__FILL:
+				return isSetFill();
+			case DGPackage.STYLE__FILL_OPACITY:
+				return isSetFillOpacity();
+			case DGPackage.STYLE__STROKE:
+				return isSetStroke();
+			case DGPackage.STYLE__STROKE_WIDTH:
+				return isSetStrokeWidth();
+			case DGPackage.STYLE__STROKE_OPACITY:
+				return isSetStrokeOpacity();
+			case DGPackage.STYLE__STROKE_DASH_LENGTH:
+				return isSetStrokeDashLengths();
+			case DGPackage.STYLE__FONT_SIZE:
+				return isSetFontSize();
+			case DGPackage.STYLE__FONT_NAME:
+				return isSetFontName();
+			case DGPackage.STYLE__FONT_ITALIC:
+				return isSetFontItalic();
+			case DGPackage.STYLE__FONT_BOLD:
+				return isSetFontBold();
+			case DGPackage.STYLE__FONT_DECORATION:
+				return isSetFontDecoration();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -1390,78 +1221,47 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP:
-			return validFontSize((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
-		case DGPackage.STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP:
-			return validFillOpacity((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
-		case DGPackage.STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP:
-			return validStrokeWidth((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
-		case DGPackage.STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP:
-			return validDashLengthSize((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
-		case DGPackage.STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP:
-			return validStrokeOpacity((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP:
+				return validFontSize((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+			case DGPackage.STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP:
+				return validFillOpacity((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+			case DGPackage.STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP:
+				return validStrokeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+			case DGPackage.STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP:
+				return validDashLengthSize((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+			case DGPackage.STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP:
+				return validStrokeOpacity((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (fillOpacity: ");
-		if (fillOpacityESet)
-			result.append(fillOpacity);
-		else
-			result.append("<unset>");
+		if (fillOpacityESet) result.append(fillOpacity); else result.append("<unset>");
 		result.append(", strokeWidth: ");
-		if (strokeWidthESet)
-			result.append(strokeWidth);
-		else
-			result.append("<unset>");
+		if (strokeWidthESet) result.append(strokeWidth); else result.append("<unset>");
 		result.append(", strokeOpacity: ");
-		if (strokeOpacityESet)
-			result.append(strokeOpacity);
-		else
-			result.append("<unset>");
+		if (strokeOpacityESet) result.append(strokeOpacity); else result.append("<unset>");
 		result.append(", strokeDashLength: ");
 		result.append(strokeDashLengths);
 		result.append(", fontSize: ");
-		if (fontSizeESet)
-			result.append(fontSize);
-		else
-			result.append("<unset>");
+		if (fontSizeESet) result.append(fontSize); else result.append("<unset>");
 		result.append(", fontName: ");
-		if (fontNameESet)
-			result.append(fontName);
-		else
-			result.append("<unset>");
+		if (fontNameESet) result.append(fontName); else result.append("<unset>");
 		result.append(", fontItalic: ");
-		if (fontItalicESet)
-			result.append(fontItalic);
-		else
-			result.append("<unset>");
+		if (fontItalicESet) result.append(fontItalic); else result.append("<unset>");
 		result.append(", fontBold: ");
-		if (fontBoldESet)
-			result.append(fontBold);
-		else
-			result.append("<unset>");
+		if (fontBoldESet) result.append(fontBold); else result.append("<unset>");
 		result.append(", fontDecoration: ");
-		if (fontDecorationESet)
-			result.append(fontDecoration);
-		else
-			result.append("<unset>");
+		if (fontDecorationESet) result.append(fontDecoration); else result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java
index e4f001d0a71..0f091e8875d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java
@@ -38,21 +38,18 @@ import org.eclipse.papyrus.dd.dg.StyleSelector;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl#getSelectors <em>
- * Selector</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl#getStyle <em>Style
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl#getSelectors <em>Selector</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl#getStyle <em>Style</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 		StyleRule {
 	/**
-	 * The cached value of the '{@link #getSelectors() <em>Selector</em>}'
-	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getSelectors() <em>Selector</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getSelectors()
 	 * @generated
 	 * @ordered
@@ -60,9 +57,8 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 	protected EList<StyleSelector> selectors;
 
 	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getStyle() <em>Style</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -71,7 +67,6 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected StyleRuleImpl() {
@@ -80,7 +75,6 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -90,20 +84,17 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<StyleSelector> getSelectors() {
 		if (selectors == null) {
-			selectors = new EObjectContainmentEList<StyleSelector>(
-					StyleSelector.class, this, DGPackage.STYLE_RULE__SELECTOR);
+			selectors = new EObjectContainmentEList<StyleSelector>(StyleSelector.class, this, DGPackage.STYLE_RULE__SELECTOR);
 		}
 		return selectors;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Style getStyle() {
@@ -112,7 +103,6 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetStyle(Style newStyle,
@@ -120,126 +110,108 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 		Style oldStyle = style;
 		style = newStyle;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.STYLE_RULE__STYLE, oldStyle,
-					newStyle);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.STYLE_RULE__STYLE, oldStyle, newStyle);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setStyle(Style newStyle) {
 		if (newStyle != style) {
 			NotificationChain msgs = null;
 			if (style != null)
-				msgs = ((InternalEObject) style).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.STYLE_RULE__STYLE,
-						null, msgs);
+				msgs = ((InternalEObject)style).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE_RULE__STYLE, null, msgs);
 			if (newStyle != null)
-				msgs = ((InternalEObject) newStyle).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.STYLE_RULE__STYLE,
-						null, msgs);
+				msgs = ((InternalEObject)newStyle).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE_RULE__STYLE, null, msgs);
 			msgs = basicSetStyle(newStyle, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.STYLE_RULE__STYLE, newStyle, newStyle));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE_RULE__STYLE, newStyle, newStyle));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.STYLE_RULE__SELECTOR:
-			return ((InternalEList<?>) getSelectors()).basicRemove(otherEnd,
-					msgs);
-		case DGPackage.STYLE_RULE__STYLE:
-			return basicSetStyle(null, msgs);
+			case DGPackage.STYLE_RULE__SELECTOR:
+				return ((InternalEList<?>)getSelectors()).basicRemove(otherEnd, msgs);
+			case DGPackage.STYLE_RULE__STYLE:
+				return basicSetStyle(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.STYLE_RULE__SELECTOR:
-			return getSelectors();
-		case DGPackage.STYLE_RULE__STYLE:
-			return getStyle();
+			case DGPackage.STYLE_RULE__SELECTOR:
+				return getSelectors();
+			case DGPackage.STYLE_RULE__STYLE:
+				return getStyle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.STYLE_RULE__SELECTOR:
-			getSelectors().clear();
-			getSelectors().addAll(
-					(Collection<? extends StyleSelector>) newValue);
-			return;
-		case DGPackage.STYLE_RULE__STYLE:
-			setStyle((Style) newValue);
-			return;
+			case DGPackage.STYLE_RULE__SELECTOR:
+				getSelectors().clear();
+				getSelectors().addAll((Collection<? extends StyleSelector>)newValue);
+				return;
+			case DGPackage.STYLE_RULE__STYLE:
+				setStyle((Style)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.STYLE_RULE__SELECTOR:
-			getSelectors().clear();
-			return;
-		case DGPackage.STYLE_RULE__STYLE:
-			setStyle((Style) null);
-			return;
+			case DGPackage.STYLE_RULE__SELECTOR:
+				getSelectors().clear();
+				return;
+			case DGPackage.STYLE_RULE__STYLE:
+				setStyle((Style)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.STYLE_RULE__SELECTOR:
-			return selectors != null && !selectors.isEmpty();
-		case DGPackage.STYLE_RULE__STYLE:
-			return style != null;
+			case DGPackage.STYLE_RULE__SELECTOR:
+				return selectors != null && !selectors.isEmpty();
+			case DGPackage.STYLE_RULE__STYLE:
+				return style != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java
index d78ddca3598..598e6a0ede6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java
@@ -28,13 +28,11 @@ import org.eclipse.papyrus.dd.dg.StyleSelector;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl#getKind <em>Kind
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl#getClasses <em>
- * Class</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl#getKind <em>Kind</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl#getClasses <em>Class</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
@@ -42,7 +40,6 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getKind()
 	 * @generated
 	 * @ordered
@@ -52,7 +49,6 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getKind()
 	 * @generated
 	 * @ordered
@@ -60,18 +56,17 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 	protected ElementKind kind = KIND_EDEFAULT;
 
 	/**
-	 * This is true if the Kind attribute has been set. <!-- begin-user-doc -->
+	 * This is true if the Kind attribute has been set.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
 	protected boolean kindESet;
 
 	/**
-	 * The cached value of the '{@link #getClasses() <em>Class</em>}' attribute
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getClasses() <em>Class</em>}' attribute list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getClasses()
 	 * @generated
 	 * @ordered
@@ -80,7 +75,6 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected StyleSelectorImpl() {
@@ -89,7 +83,6 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,7 +92,6 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public ElementKind getKind() {
@@ -108,7 +100,6 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setKind(ElementKind newKind) {
@@ -117,13 +108,11 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 		boolean oldKindESet = kindESet;
 		kindESet = true;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.STYLE_SELECTOR__KIND, oldKind, kind, !oldKindESet));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE_SELECTOR__KIND, oldKind, kind, !oldKindESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void unsetKind() {
@@ -132,14 +121,11 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 		kind = KIND_EDEFAULT;
 		kindESet = false;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.UNSET,
-					DGPackage.STYLE_SELECTOR__KIND, oldKind, KIND_EDEFAULT,
-					oldKindESet));
+			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE_SELECTOR__KIND, oldKind, KIND_EDEFAULT, oldKindESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isSetKind() {
@@ -148,103 +134,92 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<String> getClasses() {
 		if (classes == null) {
-			classes = new EDataTypeUniqueEList<String>(String.class, this,
-					DGPackage.STYLE_SELECTOR__CLASS);
+			classes = new EDataTypeUniqueEList<String>(String.class, this, DGPackage.STYLE_SELECTOR__CLASS);
 		}
 		return classes;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.STYLE_SELECTOR__KIND:
-			return getKind();
-		case DGPackage.STYLE_SELECTOR__CLASS:
-			return getClasses();
+			case DGPackage.STYLE_SELECTOR__KIND:
+				return getKind();
+			case DGPackage.STYLE_SELECTOR__CLASS:
+				return getClasses();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.STYLE_SELECTOR__KIND:
-			setKind((ElementKind) newValue);
-			return;
-		case DGPackage.STYLE_SELECTOR__CLASS:
-			getClasses().clear();
-			getClasses().addAll((Collection<? extends String>) newValue);
-			return;
+			case DGPackage.STYLE_SELECTOR__KIND:
+				setKind((ElementKind)newValue);
+				return;
+			case DGPackage.STYLE_SELECTOR__CLASS:
+				getClasses().clear();
+				getClasses().addAll((Collection<? extends String>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.STYLE_SELECTOR__KIND:
-			unsetKind();
-			return;
-		case DGPackage.STYLE_SELECTOR__CLASS:
-			getClasses().clear();
-			return;
+			case DGPackage.STYLE_SELECTOR__KIND:
+				unsetKind();
+				return;
+			case DGPackage.STYLE_SELECTOR__CLASS:
+				getClasses().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.STYLE_SELECTOR__KIND:
-			return isSetKind();
-		case DGPackage.STYLE_SELECTOR__CLASS:
-			return classes != null && !classes.isEmpty();
+			case DGPackage.STYLE_SELECTOR__KIND:
+				return isSetKind();
+			case DGPackage.STYLE_SELECTOR__CLASS:
+				return classes != null && !classes.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (kind: ");
-		if (kindESet)
-			result.append(kind);
-		else
-			result.append("<unset>");
+		if (kindESet) result.append(kind); else result.append("<unset>");
 		result.append(", class: ");
 		result.append(classes);
 		result.append(')');
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java
index 102ea2f86b4..ecf34924eca 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java
@@ -35,19 +35,17 @@ import org.eclipse.papyrus.dd.dg.StyleSheet;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl#getRules <em>Rule
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl#getRules <em>Rule</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class StyleSheetImpl extends MinimalEObjectImpl.Container implements
 		StyleSheet {
 	/**
-	 * The cached value of the '{@link #getRules() <em>Rule</em>}' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getRules() <em>Rule</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getRules()
 	 * @generated
 	 * @ordered
@@ -56,7 +54,6 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected StyleSheetImpl() {
@@ -65,7 +62,6 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,88 +71,81 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<StyleRule> getRules() {
 		if (rules == null) {
-			rules = new EObjectContainmentEList<StyleRule>(StyleRule.class,
-					this, DGPackage.STYLE_SHEET__RULE);
+			rules = new EObjectContainmentEList<StyleRule>(StyleRule.class, this, DGPackage.STYLE_SHEET__RULE);
 		}
 		return rules;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.STYLE_SHEET__RULE:
-			return ((InternalEList<?>) getRules()).basicRemove(otherEnd, msgs);
+			case DGPackage.STYLE_SHEET__RULE:
+				return ((InternalEList<?>)getRules()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.STYLE_SHEET__RULE:
-			return getRules();
+			case DGPackage.STYLE_SHEET__RULE:
+				return getRules();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.STYLE_SHEET__RULE:
-			getRules().clear();
-			getRules().addAll((Collection<? extends StyleRule>) newValue);
-			return;
+			case DGPackage.STYLE_SHEET__RULE:
+				getRules().clear();
+				getRules().addAll((Collection<? extends StyleRule>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.STYLE_SHEET__RULE:
-			getRules().clear();
-			return;
+			case DGPackage.STYLE_SHEET__RULE:
+				getRules().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.STYLE_SHEET__RULE:
-			return rules != null && !rules.isEmpty();
+			case DGPackage.STYLE_SHEET__RULE:
+				return rules != null && !rules.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java
index 7d9569050f0..8a71bf61ec6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.dd.dc.Point;
 
 import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Text;
+import org.eclipse.papyrus.dd.dg.TextAnchor;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
@@ -36,19 +37,18 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getData <em>Data</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getPosition <em>Position
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getData <em>Data</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getPosition <em>Position</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getAnchor <em>Anchor</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class TextImpl extends GraphicalElementImpl implements Text {
 	/**
 	 * The default value of the '{@link #getData() <em>Data</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getData()
 	 * @generated
 	 * @ordered
@@ -58,7 +58,6 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	/**
 	 * The cached value of the '{@link #getData() <em>Data</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getData()
 	 * @generated
 	 * @ordered
@@ -66,9 +65,8 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	protected String data = DATA_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getPosition() <em>Position</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getPosition() <em>Position</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getPosition()
 	 * @generated
 	 * @ordered
@@ -76,8 +74,27 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	protected Point position;
 
 	/**
+	 * The default value of the '{@link #getAnchor() <em>Anchor</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAnchor()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final TextAnchor ANCHOR_EDEFAULT = TextAnchor.START;
+
+	/**
+	 * The cached value of the '{@link #getAnchor() <em>Anchor</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAnchor()
+	 * @generated
+	 * @ordered
+	 */
+	protected TextAnchor anchor = ANCHOR_EDEFAULT;
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected TextImpl() {
@@ -86,7 +103,6 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -96,7 +112,6 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getData() {
@@ -105,20 +120,17 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setData(String newData) {
 		String oldData = data;
 		data = newData;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.TEXT__DATA, oldData, data));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__DATA, oldData, data));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Point getPosition() {
@@ -127,7 +139,6 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetPosition(Point newPosition,
@@ -135,49 +146,56 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 		Point oldPosition = position;
 		position = newPosition;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.TEXT__POSITION, oldPosition,
-					newPosition);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__POSITION, oldPosition, newPosition);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setPosition(Point newPosition) {
 		if (newPosition != position) {
 			NotificationChain msgs = null;
 			if (position != null)
-				msgs = ((InternalEObject) position).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.TEXT__POSITION,
-						null, msgs);
+				msgs = ((InternalEObject)position).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.TEXT__POSITION, null, msgs);
 			if (newPosition != null)
-				msgs = ((InternalEObject) newPosition).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.TEXT__POSITION,
-						null, msgs);
+				msgs = ((InternalEObject)newPosition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.TEXT__POSITION, null, msgs);
 			msgs = basicSetPosition(newPosition, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.TEXT__POSITION, newPosition, newPosition));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__POSITION, newPosition, newPosition));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public TextAnchor getAnchor() {
+		return anchor;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAnchor(TextAnchor newAnchor) {
+		TextAnchor oldAnchor = anchor;
+		anchor = newAnchor == null ? ANCHOR_EDEFAULT : newAnchor;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__ANCHOR, oldAnchor, anchor));
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
-	 * <em>Data Cannot Be Empty</em>}' invariant operation. <!-- begin-user-doc
+	 * The cached validation expression for the '{@link #dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Data Cannot Be Empty</em>}' invariant operation.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
-	 * @see #dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -185,111 +203,114 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean dataCannotBeEmpty(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.TEXT,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP,
-						DATA_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.TEXT__DATA_CANNOT_BE_EMPTY);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.TEXT,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP,
+				 DATA_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.TEXT__DATA_CANNOT_BE_EMPTY);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.TEXT__POSITION:
-			return basicSetPosition(null, msgs);
+			case DGPackage.TEXT__POSITION:
+				return basicSetPosition(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.TEXT__DATA:
-			return getData();
-		case DGPackage.TEXT__POSITION:
-			return getPosition();
+			case DGPackage.TEXT__DATA:
+				return getData();
+			case DGPackage.TEXT__POSITION:
+				return getPosition();
+			case DGPackage.TEXT__ANCHOR:
+				return getAnchor();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.TEXT__DATA:
-			setData((String) newValue);
-			return;
-		case DGPackage.TEXT__POSITION:
-			setPosition((Point) newValue);
-			return;
+			case DGPackage.TEXT__DATA:
+				setData((String)newValue);
+				return;
+			case DGPackage.TEXT__POSITION:
+				setPosition((Point)newValue);
+				return;
+			case DGPackage.TEXT__ANCHOR:
+				setAnchor((TextAnchor)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.TEXT__DATA:
-			setData(DATA_EDEFAULT);
-			return;
-		case DGPackage.TEXT__POSITION:
-			setPosition((Point) null);
-			return;
+			case DGPackage.TEXT__DATA:
+				setData(DATA_EDEFAULT);
+				return;
+			case DGPackage.TEXT__POSITION:
+				setPosition((Point)null);
+				return;
+			case DGPackage.TEXT__ANCHOR:
+				setAnchor(ANCHOR_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.TEXT__DATA:
-			return DATA_EDEFAULT == null ? data != null : !DATA_EDEFAULT
-					.equals(data);
-		case DGPackage.TEXT__POSITION:
-			return position != null;
+			case DGPackage.TEXT__DATA:
+				return DATA_EDEFAULT == null ? data != null : !DATA_EDEFAULT.equals(data);
+			case DGPackage.TEXT__POSITION:
+				return position != null;
+			case DGPackage.TEXT__ANCHOR:
+				return anchor != ANCHOR_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -297,26 +318,25 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
-			return dataCannotBeEmpty((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
+				return dataCannotBeEmpty((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (data: ");
 		result.append(data);
+		result.append(", anchor: ");
+		result.append(anchor);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java
index ee27b09e03d..5612d490ba0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java
@@ -23,14 +23,13 @@ import org.eclipse.papyrus.dd.dg.Transform;
  * <em><b>Transform</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class TransformImpl extends MinimalEObjectImpl.Container
 		implements Transform {
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected TransformImpl() {
@@ -39,7 +38,6 @@ public abstract class TransformImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java
index 92a35de6b0f..78b0b9af6e8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java
@@ -26,20 +26,17 @@ import org.eclipse.papyrus.dd.dg.Translate;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl#getDeltaX <em>Delta X
- * </em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl#getDeltaY <em>Delta Y
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl#getDeltaX <em>Delta X</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl#getDeltaY <em>Delta Y</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class TranslateImpl extends TransformImpl implements Translate {
 	/**
-	 * The default value of the '{@link #getDeltaX() <em>Delta X</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getDeltaX() <em>Delta X</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDeltaX()
 	 * @generated
 	 * @ordered
@@ -47,9 +44,8 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	protected static final double DELTA_X_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getDeltaX() <em>Delta X</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getDeltaX() <em>Delta X</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDeltaX()
 	 * @generated
 	 * @ordered
@@ -57,9 +53,8 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	protected double deltaX = DELTA_X_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDeltaY() <em>Delta Y</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getDeltaY() <em>Delta Y</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDeltaY()
 	 * @generated
 	 * @ordered
@@ -67,9 +62,8 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	protected static final double DELTA_Y_EDEFAULT = 0.0;
 
 	/**
-	 * The cached value of the '{@link #getDeltaY() <em>Delta Y</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getDeltaY() <em>Delta Y</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getDeltaY()
 	 * @generated
 	 * @ordered
@@ -78,7 +72,6 @@ public class TranslateImpl extends TransformImpl implements Translate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected TranslateImpl() {
@@ -87,7 +80,6 @@ public class TranslateImpl extends TransformImpl implements Translate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,7 +89,6 @@ public class TranslateImpl extends TransformImpl implements Translate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getDeltaX() {
@@ -106,20 +97,17 @@ public class TranslateImpl extends TransformImpl implements Translate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setDeltaX(double newDeltaX) {
 		double oldDeltaX = deltaX;
 		deltaX = newDeltaX;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.TRANSLATE__DELTA_X, oldDeltaX, deltaX));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TRANSLATE__DELTA_X, oldDeltaX, deltaX));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getDeltaY() {
@@ -128,94 +116,86 @@ public class TranslateImpl extends TransformImpl implements Translate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setDeltaY(double newDeltaY) {
 		double oldDeltaY = deltaY;
 		deltaY = newDeltaY;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.TRANSLATE__DELTA_Y, oldDeltaY, deltaY));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TRANSLATE__DELTA_Y, oldDeltaY, deltaY));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.TRANSLATE__DELTA_X:
-			return getDeltaX();
-		case DGPackage.TRANSLATE__DELTA_Y:
-			return getDeltaY();
+			case DGPackage.TRANSLATE__DELTA_X:
+				return getDeltaX();
+			case DGPackage.TRANSLATE__DELTA_Y:
+				return getDeltaY();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.TRANSLATE__DELTA_X:
-			setDeltaX((Double) newValue);
-			return;
-		case DGPackage.TRANSLATE__DELTA_Y:
-			setDeltaY((Double) newValue);
-			return;
+			case DGPackage.TRANSLATE__DELTA_X:
+				setDeltaX((Double)newValue);
+				return;
+			case DGPackage.TRANSLATE__DELTA_Y:
+				setDeltaY((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.TRANSLATE__DELTA_X:
-			setDeltaX(DELTA_X_EDEFAULT);
-			return;
-		case DGPackage.TRANSLATE__DELTA_Y:
-			setDeltaY(DELTA_Y_EDEFAULT);
-			return;
+			case DGPackage.TRANSLATE__DELTA_X:
+				setDeltaX(DELTA_X_EDEFAULT);
+				return;
+			case DGPackage.TRANSLATE__DELTA_Y:
+				setDeltaY(DELTA_Y_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.TRANSLATE__DELTA_X:
-			return deltaX != DELTA_X_EDEFAULT;
-		case DGPackage.TRANSLATE__DELTA_Y:
-			return deltaY != DELTA_Y_EDEFAULT;
+			case DGPackage.TRANSLATE__DELTA_X:
+				return deltaX != DELTA_X_EDEFAULT;
+			case DGPackage.TRANSLATE__DELTA_Y:
+				return deltaY != DELTA_Y_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (deltaX: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java
index 43c1a875ec6..96ace814158 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java
@@ -37,19 +37,17 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.UseImpl#getBounds <em>Bounds</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.dg.impl.UseImpl#getReferencedElement <em>
- * Referenced Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.UseImpl#getBounds <em>Bounds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.dg.impl.UseImpl#getReferencedElement <em>Referenced Element</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public class UseImpl extends GraphicalElementImpl implements Use {
 	/**
-	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -57,10 +55,9 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	protected Bounds bounds;
 
 	/**
-	 * The cached value of the '{@link #getReferencedElement()
-	 * <em>Referenced Element</em>}' reference. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getReferencedElement() <em>Referenced Element</em>}' reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getReferencedElement()
 	 * @generated
 	 * @ordered
@@ -69,7 +66,6 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected UseImpl() {
@@ -78,7 +74,6 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -88,7 +83,6 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -97,7 +91,6 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBounds(Bounds newBounds,
@@ -105,55 +98,41 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DGPackage.USE__BOUNDS, oldBounds,
-					newBounds);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.USE__BOUNDS, oldBounds, newBounds);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
 		if (newBounds != bounds) {
 			NotificationChain msgs = null;
 			if (bounds != null)
-				msgs = ((InternalEObject) bounds).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.USE__BOUNDS, null,
-						msgs);
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.USE__BOUNDS, null, msgs);
 			if (newBounds != null)
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DGPackage.USE__BOUNDS, null,
-						msgs);
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.USE__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.USE__BOUNDS, newBounds, newBounds));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.USE__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public GraphicalElement getReferencedElement() {
 		if (referencedElement != null && referencedElement.eIsProxy()) {
-			InternalEObject oldReferencedElement = (InternalEObject) referencedElement;
-			referencedElement = (GraphicalElement) eResolveProxy(oldReferencedElement);
+			InternalEObject oldReferencedElement = (InternalEObject)referencedElement;
+			referencedElement = (GraphicalElement)eResolveProxy(oldReferencedElement);
 			if (referencedElement != oldReferencedElement) {
 				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							DGPackage.USE__REFERENCED_ELEMENT,
-							oldReferencedElement, referencedElement));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.USE__REFERENCED_ELEMENT, oldReferencedElement, referencedElement));
 			}
 		}
 		return referencedElement;
@@ -161,7 +140,6 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public GraphicalElement basicGetReferencedElement() {
@@ -170,16 +148,13 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setReferencedElement(GraphicalElement newReferencedElement) {
 		GraphicalElement oldReferencedElement = referencedElement;
 		referencedElement = newReferencedElement;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DGPackage.USE__REFERENCED_ELEMENT, oldReferencedElement,
-					referencedElement));
+			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.USE__REFERENCED_ELEMENT, oldReferencedElement, referencedElement));
 	}
 
 	/**
@@ -197,112 +172,105 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean referencedElementHasId(DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		return DGValidator
-				.validate(
-						DGPackage.Literals.USE,
-						this,
-						diagnostics,
-						context,
-						"http://www.eclipse.org/emf/2002/Ecore/OCL",
-						DGPackage.Literals.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP,
-						REFERENCED_ELEMENT_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-						Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE,
-						DGValidator.USE__REFERENCED_ELEMENT_HAS_ID);
+		return
+			DGValidator.validate
+				(DGPackage.Literals.USE,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 DGPackage.Literals.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP,
+				 REFERENCED_ELEMENT_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 DGValidator.DIAGNOSTIC_SOURCE,
+				 DGValidator.USE__REFERENCED_ELEMENT_HAS_ID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DGPackage.USE__BOUNDS:
-			return basicSetBounds(null, msgs);
+			case DGPackage.USE__BOUNDS:
+				return basicSetBounds(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DGPackage.USE__BOUNDS:
-			return getBounds();
-		case DGPackage.USE__REFERENCED_ELEMENT:
-			if (resolve)
-				return getReferencedElement();
-			return basicGetReferencedElement();
+			case DGPackage.USE__BOUNDS:
+				return getBounds();
+			case DGPackage.USE__REFERENCED_ELEMENT:
+				if (resolve) return getReferencedElement();
+				return basicGetReferencedElement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DGPackage.USE__BOUNDS:
-			setBounds((Bounds) newValue);
-			return;
-		case DGPackage.USE__REFERENCED_ELEMENT:
-			setReferencedElement((GraphicalElement) newValue);
-			return;
+			case DGPackage.USE__BOUNDS:
+				setBounds((Bounds)newValue);
+				return;
+			case DGPackage.USE__REFERENCED_ELEMENT:
+				setReferencedElement((GraphicalElement)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DGPackage.USE__BOUNDS:
-			setBounds((Bounds) null);
-			return;
-		case DGPackage.USE__REFERENCED_ELEMENT:
-			setReferencedElement((GraphicalElement) null);
-			return;
+			case DGPackage.USE__BOUNDS:
+				setBounds((Bounds)null);
+				return;
+			case DGPackage.USE__REFERENCED_ELEMENT:
+				setReferencedElement((GraphicalElement)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DGPackage.USE__BOUNDS:
-			return bounds != null;
-		case DGPackage.USE__REFERENCED_ELEMENT:
-			return referencedElement != null;
+			case DGPackage.USE__BOUNDS:
+				return bounds != null;
+			case DGPackage.USE__REFERENCED_ELEMENT:
+				return referencedElement != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -310,9 +278,8 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	public Object eInvoke(int operationID, EList<?> arguments)
 			throws InvocationTargetException {
 		switch (operationID) {
-		case DGPackage.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP:
-			return referencedElementHasId((DiagnosticChain) arguments.get(0),
-					(Map<Object, Object>) arguments.get(1));
+			case DGPackage.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP:
+				return referencedElementHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java
index 8c7830a6820..956c257a9fc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java
@@ -24,23 +24,22 @@ import org.eclipse.papyrus.dd.dg.*;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
  * an adapter <code>createXXX</code> method for each class of the model. <!--
  * end-user-doc -->
- * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage
  * @generated
  */
 public class DGAdapterFactory extends AdapterFactoryImpl {
 
 	/**
-	 * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached model package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected static DGPackage modelPackage;
 
 	/**
-	 * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DGAdapterFactory() {
@@ -54,7 +53,6 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if
 	 * the object is either the model's package or is an instance object of the
 	 * model. <!-- end-user-doc -->
-	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -64,7 +62,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 			return true;
 		}
 		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
@@ -76,239 +74,195 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * @generated
 	 */
 	protected DGSwitch<Adapter> modelSwitch = new DGSwitch<Adapter>() {
-		@Override
-		public Adapter caseCanvas(Canvas object) {
-			return createCanvasAdapter();
-		}
-
-		@Override
-		public Adapter caseGroup(Group object) {
-			return createGroupAdapter();
-		}
-
-		@Override
-		public Adapter caseGraphicalElement(GraphicalElement object) {
-			return createGraphicalElementAdapter();
-		}
-
-		@Override
-		public Adapter caseDefinition(Definition object) {
-			return createDefinitionAdapter();
-		}
-
-		@Override
-		public Adapter caseMoveTo(MoveTo object) {
-			return createMoveToAdapter();
-		}
-
-		@Override
-		public Adapter casePathCommand(PathCommand object) {
-			return createPathCommandAdapter();
-		}
-
-		@Override
-		public Adapter caseClipPath(ClipPath object) {
-			return createClipPathAdapter();
-		}
-
-		@Override
-		public Adapter caseStyle(Style object) {
-			return createStyleAdapter();
-		}
-
-		@Override
-		public Adapter casePaint(Paint object) {
-			return createPaintAdapter();
-		}
-
-		@Override
-		public Adapter casePaintServer(PaintServer object) {
-			return createPaintServerAdapter();
-		}
-
-		@Override
-		public Adapter caseTransform(Transform object) {
-			return createTransformAdapter();
-		}
-
-		@Override
-		public Adapter caseCircle(Circle object) {
-			return createCircleAdapter();
-		}
-
-		@Override
-		public Adapter caseClosePath(ClosePath object) {
-			return createClosePathAdapter();
-		}
-
-		@Override
-		public Adapter caseCubicCurveTo(CubicCurveTo object) {
-			return createCubicCurveToAdapter();
-		}
-
-		@Override
-		public Adapter caseDefinitions(Definitions object) {
-			return createDefinitionsAdapter();
-		}
-
-		@Override
-		public Adapter caseStyleSheet(StyleSheet object) {
-			return createStyleSheetAdapter();
-		}
-
-		@Override
-		public Adapter caseStyleRule(StyleRule object) {
-			return createStyleRuleAdapter();
-		}
-
-		@Override
-		public Adapter caseStyleSelector(StyleSelector object) {
-			return createStyleSelectorAdapter();
-		}
-
-		@Override
-		public Adapter caseEllipse(Ellipse object) {
-			return createEllipseAdapter();
-		}
-
-		@Override
-		public Adapter caseEllipticalArcTo(EllipticalArcTo object) {
-			return createEllipticalArcToAdapter();
-		}
-
-		@Override
-		public Adapter caseQuadraticCurveTo(QuadraticCurveTo object) {
-			return createQuadraticCurveToAdapter();
-		}
-
-		@Override
-		public Adapter caseGradient(Gradient object) {
-			return createGradientAdapter();
-		}
-
-		@Override
-		public Adapter caseGradientStop(GradientStop object) {
-			return createGradientStopAdapter();
-		}
-
-		@Override
-		public Adapter caseImage(Image object) {
-			return createImageAdapter();
-		}
-
-		@Override
-		public Adapter caseLine(Line object) {
-			return createLineAdapter();
-		}
-
-		@Override
-		public Adapter caseMarkedElement(MarkedElement object) {
-			return createMarkedElementAdapter();
-		}
-
-		@Override
-		public Adapter caseMarker(Marker object) {
-			return createMarkerAdapter();
-		}
-
-		@Override
-		public Adapter caseLinearGradient(LinearGradient object) {
-			return createLinearGradientAdapter();
-		}
-
-		@Override
-		public Adapter caseLineTo(LineTo object) {
-			return createLineToAdapter();
-		}
-
-		@Override
-		public Adapter caseMatrix(Matrix object) {
-			return createMatrixAdapter();
-		}
-
-		@Override
-		public Adapter casePath(Path object) {
-			return createPathAdapter();
-		}
-
-		@Override
-		public Adapter casePattern(Pattern object) {
-			return createPatternAdapter();
-		}
-
-		@Override
-		public Adapter casePolygon(Polygon object) {
-			return createPolygonAdapter();
-		}
-
-		@Override
-		public Adapter casePolyline(Polyline object) {
-			return createPolylineAdapter();
-		}
-
-		@Override
-		public Adapter caseRadialGradient(RadialGradient object) {
-			return createRadialGradientAdapter();
-		}
-
-		@Override
-		public Adapter caseRectangle(Rectangle object) {
-			return createRectangleAdapter();
-		}
-
-		@Override
-		public Adapter caseRootCanvas(RootCanvas object) {
-			return createRootCanvasAdapter();
-		}
-
-		@Override
-		public Adapter caseRotate(Rotate object) {
-			return createRotateAdapter();
-		}
-
-		@Override
-		public Adapter caseScale(Scale object) {
-			return createScaleAdapter();
-		}
-
-		@Override
-		public Adapter caseSkew(Skew object) {
-			return createSkewAdapter();
-		}
-
-		@Override
-		public Adapter caseText(Text object) {
-			return createTextAdapter();
-		}
-
-		@Override
-		public Adapter caseTranslate(Translate object) {
-			return createTranslateAdapter();
-		}
-
-		@Override
-		public Adapter caseUse(Use object) {
-			return createUseAdapter();
-		}
-
-		@Override
-		public Adapter defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
-
-	/**
-	 * Creates an adapter for the <code>target</code>. <!-- begin-user-doc -->
+			@Override
+			public Adapter caseCanvas(Canvas object) {
+				return createCanvasAdapter();
+			}
+			@Override
+			public Adapter caseGroup(Group object) {
+				return createGroupAdapter();
+			}
+			@Override
+			public Adapter caseGraphicalElement(GraphicalElement object) {
+				return createGraphicalElementAdapter();
+			}
+			@Override
+			public Adapter caseDefinition(Definition object) {
+				return createDefinitionAdapter();
+			}
+			@Override
+			public Adapter caseMoveTo(MoveTo object) {
+				return createMoveToAdapter();
+			}
+			@Override
+			public Adapter casePathCommand(PathCommand object) {
+				return createPathCommandAdapter();
+			}
+			@Override
+			public Adapter caseClipPath(ClipPath object) {
+				return createClipPathAdapter();
+			}
+			@Override
+			public Adapter caseStyle(Style object) {
+				return createStyleAdapter();
+			}
+			@Override
+			public Adapter casePaint(Paint object) {
+				return createPaintAdapter();
+			}
+			@Override
+			public Adapter casePaintServer(PaintServer object) {
+				return createPaintServerAdapter();
+			}
+			@Override
+			public Adapter caseTransform(Transform object) {
+				return createTransformAdapter();
+			}
+			@Override
+			public Adapter caseCircle(Circle object) {
+				return createCircleAdapter();
+			}
+			@Override
+			public Adapter caseClosePath(ClosePath object) {
+				return createClosePathAdapter();
+			}
+			@Override
+			public Adapter caseCubicCurveTo(CubicCurveTo object) {
+				return createCubicCurveToAdapter();
+			}
+			@Override
+			public Adapter caseDefinitions(Definitions object) {
+				return createDefinitionsAdapter();
+			}
+			@Override
+			public Adapter caseStyleSheet(StyleSheet object) {
+				return createStyleSheetAdapter();
+			}
+			@Override
+			public Adapter caseStyleRule(StyleRule object) {
+				return createStyleRuleAdapter();
+			}
+			@Override
+			public Adapter caseStyleSelector(StyleSelector object) {
+				return createStyleSelectorAdapter();
+			}
+			@Override
+			public Adapter caseEllipse(Ellipse object) {
+				return createEllipseAdapter();
+			}
+			@Override
+			public Adapter caseEllipticalArcTo(EllipticalArcTo object) {
+				return createEllipticalArcToAdapter();
+			}
+			@Override
+			public Adapter caseQuadraticCurveTo(QuadraticCurveTo object) {
+				return createQuadraticCurveToAdapter();
+			}
+			@Override
+			public Adapter caseGradient(Gradient object) {
+				return createGradientAdapter();
+			}
+			@Override
+			public Adapter caseGradientStop(GradientStop object) {
+				return createGradientStopAdapter();
+			}
+			@Override
+			public Adapter caseImage(Image object) {
+				return createImageAdapter();
+			}
+			@Override
+			public Adapter caseLine(Line object) {
+				return createLineAdapter();
+			}
+			@Override
+			public Adapter caseMarkedElement(MarkedElement object) {
+				return createMarkedElementAdapter();
+			}
+			@Override
+			public Adapter caseMarker(Marker object) {
+				return createMarkerAdapter();
+			}
+			@Override
+			public Adapter caseLinearGradient(LinearGradient object) {
+				return createLinearGradientAdapter();
+			}
+			@Override
+			public Adapter caseLineTo(LineTo object) {
+				return createLineToAdapter();
+			}
+			@Override
+			public Adapter caseMatrix(Matrix object) {
+				return createMatrixAdapter();
+			}
+			@Override
+			public Adapter casePath(Path object) {
+				return createPathAdapter();
+			}
+			@Override
+			public Adapter casePattern(Pattern object) {
+				return createPatternAdapter();
+			}
+			@Override
+			public Adapter casePolygon(Polygon object) {
+				return createPolygonAdapter();
+			}
+			@Override
+			public Adapter casePolyline(Polyline object) {
+				return createPolylineAdapter();
+			}
+			@Override
+			public Adapter caseRadialGradient(RadialGradient object) {
+				return createRadialGradientAdapter();
+			}
+			@Override
+			public Adapter caseRectangle(Rectangle object) {
+				return createRectangleAdapter();
+			}
+			@Override
+			public Adapter caseRootCanvas(RootCanvas object) {
+				return createRootCanvasAdapter();
+			}
+			@Override
+			public Adapter caseRotate(Rotate object) {
+				return createRotateAdapter();
+			}
+			@Override
+			public Adapter caseScale(Scale object) {
+				return createScaleAdapter();
+			}
+			@Override
+			public Adapter caseSkew(Skew object) {
+				return createSkewAdapter();
+			}
+			@Override
+			public Adapter caseText(Text object) {
+				return createTextAdapter();
+			}
+			@Override
+			public Adapter caseTranslate(Translate object) {
+				return createTranslateAdapter();
+			}
+			@Override
+			public Adapter caseUse(Use object) {
+				return createUseAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param target
-	 *            the object to adapt.
+	 * @param target the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
+		return modelSwitch.doSwitch((EObject)target);
 	}
 
 	/**
@@ -342,13 +296,11 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement
-	 * <em>Graphical Element</em>}'. <!-- begin-user-doc --> This default
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.dg.GraphicalElement <em>Graphical Element</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.dd.dg.GraphicalElement
 	 * @generated
@@ -418,12 +370,10 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.PaintServer <em>Paint Server</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.dg.PaintServer <em>Paint Server</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.dd.dg.PaintServer
 	 * @generated
@@ -463,12 +413,10 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.CubicCurveTo <em>Cubic Curve To</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo <em>Cubic Curve To</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.dd.dg.CubicCurveTo
 	 * @generated
@@ -478,12 +426,10 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.PathCommand <em>Path Command</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.dg.PathCommand <em>Path Command</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.dd.dg.PathCommand
 	 * @generated
@@ -538,12 +484,10 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSelector <em>Style Selector</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.dg.StyleSelector <em>Style Selector</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.dd.dg.StyleSelector
 	 * @generated
@@ -598,13 +542,11 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo
-	 * <em>Elliptical Arc To</em>}'. <!-- begin-user-doc --> This default
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo <em>Elliptical Arc To</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.dd.dg.EllipticalArcTo
 	 * @generated
@@ -614,13 +556,11 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo
-	 * <em>Quadratic Curve To</em>}'. <!-- begin-user-doc --> This default
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo <em>Quadratic Curve To</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.dd.dg.QuadraticCurveTo
 	 * @generated
@@ -645,12 +585,10 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop <em>Gradient Stop</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.dg.GradientStop <em>Gradient Stop</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.dd.dg.GradientStop
 	 * @generated
@@ -690,12 +628,10 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement <em>Marked Element</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.dg.MarkedElement <em>Marked Element</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.dd.dg.MarkedElement
 	 * @generated
@@ -705,12 +641,10 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.LinearGradient <em>Linear Gradient</em>}
-	 * '. <!-- begin-user-doc --> This default implementation returns null so
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.dg.LinearGradient <em>Linear Gradient</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.dd.dg.LinearGradient
 	 * @generated
@@ -825,12 +759,10 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient <em>Radial Gradient</em>}
-	 * '. <!-- begin-user-doc --> This default implementation returns null so
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.dg.RadialGradient <em>Radial Gradient</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.dd.dg.RadialGradient
 	 * @generated
@@ -945,12 +877,11 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Use <em>Use</em>}'. <!-- begin-user-doc
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.dg.Use <em>Use</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.dd.dg.Use
 	 * @generated
@@ -960,9 +891,9 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for the default case. <!-- begin-user-doc --> This
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc --> This
 	 * default implementation returns null. <!-- end-user-doc -->
-	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java
index 1416204f031..b65156813cc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java
@@ -25,23 +25,22 @@ import org.eclipse.papyrus.dd.dg.*;
  * starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the
  * result of the switch. <!-- end-user-doc -->
- * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage
  * @generated
  */
 public class DGSwitch<T> extends Switch<T> {
 
 	/**
-	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached model package
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected static DGPackage modelPackage;
 
 	/**
-	 * Creates an instance of the switch. <!-- begin-user-doc --> <!--
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DGSwitch() {
@@ -64,461 +63,348 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns
-	 * a non null result; it yields that result. <!-- begin-user-doc --> <!--
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return the first non-null result returned by a <code>caseXXX</code>
-	 *         call.
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-		case DGPackage.CANVAS: {
-			Canvas canvas = (Canvas) theEObject;
-			T result = caseCanvas(canvas);
-			if (result == null)
-				result = caseGroup(canvas);
-			if (result == null)
-				result = caseGraphicalElement(canvas);
-			if (result == null)
-				result = caseDefinition(canvas);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.GROUP: {
-			Group group = (Group) theEObject;
-			T result = caseGroup(group);
-			if (result == null)
-				result = caseGraphicalElement(group);
-			if (result == null)
-				result = caseDefinition(group);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.GRAPHICAL_ELEMENT: {
-			GraphicalElement graphicalElement = (GraphicalElement) theEObject;
-			T result = caseGraphicalElement(graphicalElement);
-			if (result == null)
-				result = caseDefinition(graphicalElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.DEFINITION: {
-			Definition definition = (Definition) theEObject;
-			T result = caseDefinition(definition);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.MOVE_TO: {
-			MoveTo moveTo = (MoveTo) theEObject;
-			T result = caseMoveTo(moveTo);
-			if (result == null)
-				result = casePathCommand(moveTo);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.PATH_COMMAND: {
-			PathCommand pathCommand = (PathCommand) theEObject;
-			T result = casePathCommand(pathCommand);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.CLIP_PATH: {
-			ClipPath clipPath = (ClipPath) theEObject;
-			T result = caseClipPath(clipPath);
-			if (result == null)
-				result = caseGroup(clipPath);
-			if (result == null)
-				result = caseGraphicalElement(clipPath);
-			if (result == null)
-				result = caseDefinition(clipPath);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.STYLE: {
-			Style style = (Style) theEObject;
-			T result = caseStyle(style);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.PAINT: {
-			Paint paint = (Paint) theEObject;
-			T result = casePaint(paint);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.PAINT_SERVER: {
-			PaintServer paintServer = (PaintServer) theEObject;
-			T result = casePaintServer(paintServer);
-			if (result == null)
-				result = caseDefinition(paintServer);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.TRANSFORM: {
-			Transform transform = (Transform) theEObject;
-			T result = caseTransform(transform);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.CIRCLE: {
-			Circle circle = (Circle) theEObject;
-			T result = caseCircle(circle);
-			if (result == null)
-				result = caseGraphicalElement(circle);
-			if (result == null)
-				result = caseDefinition(circle);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.CLOSE_PATH: {
-			ClosePath closePath = (ClosePath) theEObject;
-			T result = caseClosePath(closePath);
-			if (result == null)
-				result = casePathCommand(closePath);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.CUBIC_CURVE_TO: {
-			CubicCurveTo cubicCurveTo = (CubicCurveTo) theEObject;
-			T result = caseCubicCurveTo(cubicCurveTo);
-			if (result == null)
-				result = casePathCommand(cubicCurveTo);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.DEFINITIONS: {
-			Definitions definitions = (Definitions) theEObject;
-			T result = caseDefinitions(definitions);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.STYLE_SHEET: {
-			StyleSheet styleSheet = (StyleSheet) theEObject;
-			T result = caseStyleSheet(styleSheet);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.STYLE_RULE: {
-			StyleRule styleRule = (StyleRule) theEObject;
-			T result = caseStyleRule(styleRule);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.STYLE_SELECTOR: {
-			StyleSelector styleSelector = (StyleSelector) theEObject;
-			T result = caseStyleSelector(styleSelector);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.ELLIPSE: {
-			Ellipse ellipse = (Ellipse) theEObject;
-			T result = caseEllipse(ellipse);
-			if (result == null)
-				result = caseGraphicalElement(ellipse);
-			if (result == null)
-				result = caseDefinition(ellipse);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.ELLIPTICAL_ARC_TO: {
-			EllipticalArcTo ellipticalArcTo = (EllipticalArcTo) theEObject;
-			T result = caseEllipticalArcTo(ellipticalArcTo);
-			if (result == null)
-				result = casePathCommand(ellipticalArcTo);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.QUADRATIC_CURVE_TO: {
-			QuadraticCurveTo quadraticCurveTo = (QuadraticCurveTo) theEObject;
-			T result = caseQuadraticCurveTo(quadraticCurveTo);
-			if (result == null)
-				result = casePathCommand(quadraticCurveTo);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.GRADIENT: {
-			Gradient gradient = (Gradient) theEObject;
-			T result = caseGradient(gradient);
-			if (result == null)
-				result = casePaintServer(gradient);
-			if (result == null)
-				result = caseDefinition(gradient);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.GRADIENT_STOP: {
-			GradientStop gradientStop = (GradientStop) theEObject;
-			T result = caseGradientStop(gradientStop);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.IMAGE: {
-			Image image = (Image) theEObject;
-			T result = caseImage(image);
-			if (result == null)
-				result = caseGraphicalElement(image);
-			if (result == null)
-				result = caseDefinition(image);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.LINE: {
-			Line line = (Line) theEObject;
-			T result = caseLine(line);
-			if (result == null)
-				result = caseMarkedElement(line);
-			if (result == null)
-				result = caseGraphicalElement(line);
-			if (result == null)
-				result = caseDefinition(line);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.MARKED_ELEMENT: {
-			MarkedElement markedElement = (MarkedElement) theEObject;
-			T result = caseMarkedElement(markedElement);
-			if (result == null)
-				result = caseGraphicalElement(markedElement);
-			if (result == null)
-				result = caseDefinition(markedElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.MARKER: {
-			Marker marker = (Marker) theEObject;
-			T result = caseMarker(marker);
-			if (result == null)
-				result = caseGroup(marker);
-			if (result == null)
-				result = caseGraphicalElement(marker);
-			if (result == null)
-				result = caseDefinition(marker);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.LINEAR_GRADIENT: {
-			LinearGradient linearGradient = (LinearGradient) theEObject;
-			T result = caseLinearGradient(linearGradient);
-			if (result == null)
-				result = caseGradient(linearGradient);
-			if (result == null)
-				result = casePaintServer(linearGradient);
-			if (result == null)
-				result = caseDefinition(linearGradient);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.LINE_TO: {
-			LineTo lineTo = (LineTo) theEObject;
-			T result = caseLineTo(lineTo);
-			if (result == null)
-				result = casePathCommand(lineTo);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.MATRIX: {
-			Matrix matrix = (Matrix) theEObject;
-			T result = caseMatrix(matrix);
-			if (result == null)
-				result = caseTransform(matrix);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.PATH: {
-			Path path = (Path) theEObject;
-			T result = casePath(path);
-			if (result == null)
-				result = caseMarkedElement(path);
-			if (result == null)
-				result = caseGraphicalElement(path);
-			if (result == null)
-				result = caseDefinition(path);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.PATTERN: {
-			Pattern pattern = (Pattern) theEObject;
-			T result = casePattern(pattern);
-			if (result == null)
-				result = casePaintServer(pattern);
-			if (result == null)
-				result = caseDefinition(pattern);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.POLYGON: {
-			Polygon polygon = (Polygon) theEObject;
-			T result = casePolygon(polygon);
-			if (result == null)
-				result = caseMarkedElement(polygon);
-			if (result == null)
-				result = caseGraphicalElement(polygon);
-			if (result == null)
-				result = caseDefinition(polygon);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.POLYLINE: {
-			Polyline polyline = (Polyline) theEObject;
-			T result = casePolyline(polyline);
-			if (result == null)
-				result = caseMarkedElement(polyline);
-			if (result == null)
-				result = caseGraphicalElement(polyline);
-			if (result == null)
-				result = caseDefinition(polyline);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.RADIAL_GRADIENT: {
-			RadialGradient radialGradient = (RadialGradient) theEObject;
-			T result = caseRadialGradient(radialGradient);
-			if (result == null)
-				result = caseGradient(radialGradient);
-			if (result == null)
-				result = casePaintServer(radialGradient);
-			if (result == null)
-				result = caseDefinition(radialGradient);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.RECTANGLE: {
-			Rectangle rectangle = (Rectangle) theEObject;
-			T result = caseRectangle(rectangle);
-			if (result == null)
-				result = caseGraphicalElement(rectangle);
-			if (result == null)
-				result = caseDefinition(rectangle);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.ROOT_CANVAS: {
-			RootCanvas rootCanvas = (RootCanvas) theEObject;
-			T result = caseRootCanvas(rootCanvas);
-			if (result == null)
-				result = caseCanvas(rootCanvas);
-			if (result == null)
-				result = caseGroup(rootCanvas);
-			if (result == null)
-				result = caseGraphicalElement(rootCanvas);
-			if (result == null)
-				result = caseDefinition(rootCanvas);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.ROTATE: {
-			Rotate rotate = (Rotate) theEObject;
-			T result = caseRotate(rotate);
-			if (result == null)
-				result = caseTransform(rotate);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.SCALE: {
-			Scale scale = (Scale) theEObject;
-			T result = caseScale(scale);
-			if (result == null)
-				result = caseTransform(scale);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.SKEW: {
-			Skew skew = (Skew) theEObject;
-			T result = caseSkew(skew);
-			if (result == null)
-				result = caseTransform(skew);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.TEXT: {
-			Text text = (Text) theEObject;
-			T result = caseText(text);
-			if (result == null)
-				result = caseGraphicalElement(text);
-			if (result == null)
-				result = caseDefinition(text);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.TRANSLATE: {
-			Translate translate = (Translate) theEObject;
-			T result = caseTranslate(translate);
-			if (result == null)
-				result = caseTransform(translate);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DGPackage.USE: {
-			Use use = (Use) theEObject;
-			T result = caseUse(use);
-			if (result == null)
-				result = caseGraphicalElement(use);
-			if (result == null)
-				result = caseDefinition(use);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
+			case DGPackage.CANVAS: {
+				Canvas canvas = (Canvas)theEObject;
+				T result = caseCanvas(canvas);
+				if (result == null) result = caseGroup(canvas);
+				if (result == null) result = caseGraphicalElement(canvas);
+				if (result == null) result = caseDefinition(canvas);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.GROUP: {
+				Group group = (Group)theEObject;
+				T result = caseGroup(group);
+				if (result == null) result = caseGraphicalElement(group);
+				if (result == null) result = caseDefinition(group);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.GRAPHICAL_ELEMENT: {
+				GraphicalElement graphicalElement = (GraphicalElement)theEObject;
+				T result = caseGraphicalElement(graphicalElement);
+				if (result == null) result = caseDefinition(graphicalElement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.DEFINITION: {
+				Definition definition = (Definition)theEObject;
+				T result = caseDefinition(definition);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.MOVE_TO: {
+				MoveTo moveTo = (MoveTo)theEObject;
+				T result = caseMoveTo(moveTo);
+				if (result == null) result = casePathCommand(moveTo);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.PATH_COMMAND: {
+				PathCommand pathCommand = (PathCommand)theEObject;
+				T result = casePathCommand(pathCommand);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.CLIP_PATH: {
+				ClipPath clipPath = (ClipPath)theEObject;
+				T result = caseClipPath(clipPath);
+				if (result == null) result = caseGroup(clipPath);
+				if (result == null) result = caseGraphicalElement(clipPath);
+				if (result == null) result = caseDefinition(clipPath);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.STYLE: {
+				Style style = (Style)theEObject;
+				T result = caseStyle(style);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.PAINT: {
+				Paint paint = (Paint)theEObject;
+				T result = casePaint(paint);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.PAINT_SERVER: {
+				PaintServer paintServer = (PaintServer)theEObject;
+				T result = casePaintServer(paintServer);
+				if (result == null) result = caseDefinition(paintServer);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.TRANSFORM: {
+				Transform transform = (Transform)theEObject;
+				T result = caseTransform(transform);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.CIRCLE: {
+				Circle circle = (Circle)theEObject;
+				T result = caseCircle(circle);
+				if (result == null) result = caseGraphicalElement(circle);
+				if (result == null) result = caseDefinition(circle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.CLOSE_PATH: {
+				ClosePath closePath = (ClosePath)theEObject;
+				T result = caseClosePath(closePath);
+				if (result == null) result = casePathCommand(closePath);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.CUBIC_CURVE_TO: {
+				CubicCurveTo cubicCurveTo = (CubicCurveTo)theEObject;
+				T result = caseCubicCurveTo(cubicCurveTo);
+				if (result == null) result = casePathCommand(cubicCurveTo);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.DEFINITIONS: {
+				Definitions definitions = (Definitions)theEObject;
+				T result = caseDefinitions(definitions);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.STYLE_SHEET: {
+				StyleSheet styleSheet = (StyleSheet)theEObject;
+				T result = caseStyleSheet(styleSheet);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.STYLE_RULE: {
+				StyleRule styleRule = (StyleRule)theEObject;
+				T result = caseStyleRule(styleRule);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.STYLE_SELECTOR: {
+				StyleSelector styleSelector = (StyleSelector)theEObject;
+				T result = caseStyleSelector(styleSelector);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.ELLIPSE: {
+				Ellipse ellipse = (Ellipse)theEObject;
+				T result = caseEllipse(ellipse);
+				if (result == null) result = caseGraphicalElement(ellipse);
+				if (result == null) result = caseDefinition(ellipse);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.ELLIPTICAL_ARC_TO: {
+				EllipticalArcTo ellipticalArcTo = (EllipticalArcTo)theEObject;
+				T result = caseEllipticalArcTo(ellipticalArcTo);
+				if (result == null) result = casePathCommand(ellipticalArcTo);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.QUADRATIC_CURVE_TO: {
+				QuadraticCurveTo quadraticCurveTo = (QuadraticCurveTo)theEObject;
+				T result = caseQuadraticCurveTo(quadraticCurveTo);
+				if (result == null) result = casePathCommand(quadraticCurveTo);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.GRADIENT: {
+				Gradient gradient = (Gradient)theEObject;
+				T result = caseGradient(gradient);
+				if (result == null) result = casePaintServer(gradient);
+				if (result == null) result = caseDefinition(gradient);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.GRADIENT_STOP: {
+				GradientStop gradientStop = (GradientStop)theEObject;
+				T result = caseGradientStop(gradientStop);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.IMAGE: {
+				Image image = (Image)theEObject;
+				T result = caseImage(image);
+				if (result == null) result = caseGraphicalElement(image);
+				if (result == null) result = caseDefinition(image);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.LINE: {
+				Line line = (Line)theEObject;
+				T result = caseLine(line);
+				if (result == null) result = caseMarkedElement(line);
+				if (result == null) result = caseGraphicalElement(line);
+				if (result == null) result = caseDefinition(line);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.MARKED_ELEMENT: {
+				MarkedElement markedElement = (MarkedElement)theEObject;
+				T result = caseMarkedElement(markedElement);
+				if (result == null) result = caseGraphicalElement(markedElement);
+				if (result == null) result = caseDefinition(markedElement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.MARKER: {
+				Marker marker = (Marker)theEObject;
+				T result = caseMarker(marker);
+				if (result == null) result = caseGroup(marker);
+				if (result == null) result = caseGraphicalElement(marker);
+				if (result == null) result = caseDefinition(marker);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.LINEAR_GRADIENT: {
+				LinearGradient linearGradient = (LinearGradient)theEObject;
+				T result = caseLinearGradient(linearGradient);
+				if (result == null) result = caseGradient(linearGradient);
+				if (result == null) result = casePaintServer(linearGradient);
+				if (result == null) result = caseDefinition(linearGradient);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.LINE_TO: {
+				LineTo lineTo = (LineTo)theEObject;
+				T result = caseLineTo(lineTo);
+				if (result == null) result = casePathCommand(lineTo);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.MATRIX: {
+				Matrix matrix = (Matrix)theEObject;
+				T result = caseMatrix(matrix);
+				if (result == null) result = caseTransform(matrix);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.PATH: {
+				Path path = (Path)theEObject;
+				T result = casePath(path);
+				if (result == null) result = caseMarkedElement(path);
+				if (result == null) result = caseGraphicalElement(path);
+				if (result == null) result = caseDefinition(path);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.PATTERN: {
+				Pattern pattern = (Pattern)theEObject;
+				T result = casePattern(pattern);
+				if (result == null) result = casePaintServer(pattern);
+				if (result == null) result = caseDefinition(pattern);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.POLYGON: {
+				Polygon polygon = (Polygon)theEObject;
+				T result = casePolygon(polygon);
+				if (result == null) result = caseMarkedElement(polygon);
+				if (result == null) result = caseGraphicalElement(polygon);
+				if (result == null) result = caseDefinition(polygon);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.POLYLINE: {
+				Polyline polyline = (Polyline)theEObject;
+				T result = casePolyline(polyline);
+				if (result == null) result = caseMarkedElement(polyline);
+				if (result == null) result = caseGraphicalElement(polyline);
+				if (result == null) result = caseDefinition(polyline);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.RADIAL_GRADIENT: {
+				RadialGradient radialGradient = (RadialGradient)theEObject;
+				T result = caseRadialGradient(radialGradient);
+				if (result == null) result = caseGradient(radialGradient);
+				if (result == null) result = casePaintServer(radialGradient);
+				if (result == null) result = caseDefinition(radialGradient);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.RECTANGLE: {
+				Rectangle rectangle = (Rectangle)theEObject;
+				T result = caseRectangle(rectangle);
+				if (result == null) result = caseGraphicalElement(rectangle);
+				if (result == null) result = caseDefinition(rectangle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.ROOT_CANVAS: {
+				RootCanvas rootCanvas = (RootCanvas)theEObject;
+				T result = caseRootCanvas(rootCanvas);
+				if (result == null) result = caseCanvas(rootCanvas);
+				if (result == null) result = caseGroup(rootCanvas);
+				if (result == null) result = caseGraphicalElement(rootCanvas);
+				if (result == null) result = caseDefinition(rootCanvas);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.ROTATE: {
+				Rotate rotate = (Rotate)theEObject;
+				T result = caseRotate(rotate);
+				if (result == null) result = caseTransform(rotate);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.SCALE: {
+				Scale scale = (Scale)theEObject;
+				T result = caseScale(scale);
+				if (result == null) result = caseTransform(scale);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.SKEW: {
+				Skew skew = (Skew)theEObject;
+				T result = caseSkew(skew);
+				if (result == null) result = caseTransform(skew);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.TEXT: {
+				Text text = (Text)theEObject;
+				T result = caseText(text);
+				if (result == null) result = caseGraphicalElement(text);
+				if (result == null) result = caseDefinition(text);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.TRANSLATE: {
+				Translate translate = (Translate)theEObject;
+				T result = caseTranslate(translate);
+				if (result == null) result = caseTransform(translate);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DGPackage.USE: {
+				Use use = (Use)theEObject;
+				T result = caseUse(use);
+				if (result == null) result = caseGraphicalElement(use);
+				if (result == null) result = caseDefinition(use);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
 		}
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Canvas</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Canvas</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>Canvas</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Canvas</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -527,15 +413,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Group</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Group</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>Group</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Group</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -544,15 +427,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Graphical Element</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Graphical Element</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>Graphical Element</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Graphical Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -561,15 +441,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Definition</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Definition</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>Definition</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Definition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -578,15 +455,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Clip Path</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Clip Path</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>Clip Path</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Clip Path</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -595,15 +469,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Style</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>Style</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -612,15 +483,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Paint</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Paint</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>Paint</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Paint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -629,15 +497,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Paint Server</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Paint Server</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>Paint Server</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Paint Server</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -646,15 +511,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Transform</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Transform</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>Transform</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Transform</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -663,15 +525,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Definitions</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Definitions</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>Definitions</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Definitions</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -680,15 +539,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Cubic Curve To</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Cubic Curve To</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>Cubic Curve To</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Cubic Curve To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -697,15 +553,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Path Command</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Path Command</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>Path Command</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Path Command</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -714,15 +567,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Marker</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Marker</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>Marker</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Marker</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -731,15 +581,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Style Sheet</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Style Sheet</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>Style Sheet</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Style Sheet</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -748,15 +595,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Style Rule</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Style Rule</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>Style Rule</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Style Rule</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -765,15 +609,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Style Selector</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Style Selector</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>Style Selector</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Style Selector</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -782,15 +623,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Circle</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Circle</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>Circle</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Circle</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -799,15 +637,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Close Path</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Close Path</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>Close Path</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Close Path</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -816,15 +651,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Ellipse</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Ellipse</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>Ellipse</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Ellipse</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -833,15 +665,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Elliptical Arc To</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Elliptical Arc To</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>Elliptical Arc To</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Elliptical Arc To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -850,15 +679,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Quadratic Curve To</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Quadratic Curve To</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>Quadratic Curve To</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Quadratic Curve To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -867,15 +693,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Gradient</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Gradient</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>Gradient</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Gradient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -884,15 +707,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Gradient Stop</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Gradient Stop</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>Gradient Stop</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Gradient Stop</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -901,15 +721,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Image</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Image</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>Image</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Image</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -935,15 +752,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Marked Element</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Marked Element</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>Marked Element</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Marked Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -952,15 +766,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Linear Gradient</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Linear Gradient</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>Linear Gradient</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Linear Gradient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -969,15 +780,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Line To</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Line To</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>Line To</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Line To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -986,15 +794,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Matrix</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Matrix</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>Matrix</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Matrix</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1003,15 +808,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Move To</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Move To</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>Move To</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Move To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1037,15 +839,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Pattern</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Pattern</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>Pattern</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Pattern</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1054,15 +853,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Polygon</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Polygon</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>Polygon</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Polygon</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1071,15 +867,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Polyline</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Polyline</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>Polyline</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Polyline</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1088,15 +881,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Radial Gradient</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Radial Gradient</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>Radial Gradient</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Radial Gradient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1105,15 +895,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Rectangle</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Rectangle</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>Rectangle</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Rectangle</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1122,15 +909,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Root Canvas</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Root Canvas</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>Root Canvas</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Root Canvas</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1139,15 +923,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Rotate</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Rotate</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>Rotate</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Rotate</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1156,15 +937,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Scale</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Scale</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>Scale</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Scale</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1207,15 +985,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Translate</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Translate</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>Translate</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Translate</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1241,15 +1016,12 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>EObject</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch, but this is
 	 * the last case anyway. <!-- end-user-doc -->
-	 * 
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '
-	 *         <em>EObject</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java
index 00f2e36fae2..33929df30f4 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java
@@ -35,18 +35,15 @@ import org.eclipse.papyrus.dd.dg.*;
 public class DGValidator extends EObjectValidator {
 
 	/**
-	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached model package
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static final DGValidator INSTANCE = new DGValidator();
 
 	/**
-	 * A constant for the
-	 * {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of
-	 * diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes}
-	 * from this package. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
 	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
 	 * @generated
@@ -72,55 +69,49 @@ public class DGValidator extends EObjectValidator {
 	public static final int GRAPHICAL_ELEMENT__REFERENCED_CLIPPATH_HAS_ID = 2;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Id Cannot Be Empty' of 'Definition'. <!-- begin-user-doc -->
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Id Cannot Be Empty' of 'Definition'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int DEFINITION__ID_CANNOT_BE_EMPTY = 3;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Valid Font Size' of 'Style'. <!-- begin-user-doc --> <!--
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Font Size' of 'Style'.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int STYLE__VALID_FONT_SIZE = 4;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Valid Fill Opacity' of 'Style'. <!-- begin-user-doc --> <!--
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Fill Opacity' of 'Style'.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int STYLE__VALID_FILL_OPACITY = 5;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Valid Stroke Width' of 'Style'. <!-- begin-user-doc --> <!--
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Stroke Width' of 'Style'.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int STYLE__VALID_STROKE_WIDTH = 6;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Valid Dash Length Size' of 'Style'. <!-- begin-user-doc -->
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Dash Length Size' of 'Style'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int STYLE__VALID_DASH_LENGTH_SIZE = 7;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Valid Stroke Opacity' of 'Style'. <!-- begin-user-doc -->
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Stroke Opacity' of 'Style'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int STYLE__VALID_STROKE_OPACITY = 8;
@@ -135,37 +126,33 @@ public class DGValidator extends EObjectValidator {
 	public static final int PAINT__REFERENCED_PAINT_SERVER_HAS_ID = 9;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Non Negative Radius' of 'Circle'. <!-- begin-user-doc -->
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Non Negative Radius' of 'Circle'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int CIRCLE__NON_NEGATIVE_RADIUS = 10;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Valid Offset' of 'Gradient Stop'. <!-- begin-user-doc -->
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Offset' of 'Gradient Stop'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int GRADIENT_STOP__VALID_OFFSET = 11;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Valid Opacity' of 'Gradient Stop'. <!-- begin-user-doc -->
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Opacity' of 'Gradient Stop'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int GRADIENT_STOP__VALID_OPACITY = 12;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Source Cannot Be Empty' of 'Image'. <!-- begin-user-doc -->
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Source Cannot Be Empty' of 'Image'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int IMAGE__SOURCE_CANNOT_BE_EMPTY = 13;
@@ -207,37 +194,33 @@ public class DGValidator extends EObjectValidator {
 	public static final int LINEAR_GRADIENT__VALID_GRADIENT_VECTOR = 17;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'First Command Must Be Move' of 'Path'. <!-- begin-user-doc
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'First Command Must Be Move' of 'Path'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int PATH__FIRST_COMMAND_MUST_BE_MOVE = 18;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Valid Center Point' of 'Radial Gradient'. <!-- begin-user-doc
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Center Point' of 'Radial Gradient'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int RADIAL_GRADIENT__VALID_CENTER_POINT = 19;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Valid Focus Point' of 'Radial Gradient'. <!-- begin-user-doc
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Focus Point' of 'Radial Gradient'.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int RADIAL_GRADIENT__VALID_FOCUS_POINT = 20;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Valid Radius' of 'Radial Gradient'. <!-- begin-user-doc -->
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Radius' of 'Radial Gradient'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int RADIAL_GRADIENT__VALID_RADIUS = 21;
@@ -252,69 +235,61 @@ public class DGValidator extends EObjectValidator {
 	public static final int RECTANGLE__NON_NEGATIVE_CORNER_RADIUS = 22;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Nonnegativescale' of 'Scale'. <!-- begin-user-doc --> <!--
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Nonnegativescale' of 'Scale'.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int SCALE__NONNEGATIVESCALE = 23;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Data Cannot Be Empty' of 'Text'. <!-- begin-user-doc --> <!--
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Data Cannot Be Empty' of 'Text'.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int TEXT__DATA_CANNOT_BE_EMPTY = 24;
 
 	/**
-	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for
-	 * constraint 'Referenced Element Has Id' of 'Use'. <!-- begin-user-doc -->
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Referenced Element Has Id' of 'Use'.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static final int USE__REFERENCED_ELEMENT_HAS_ID = 25;
 
 	/**
-	 * A constant with a fixed name that can be used as the base value for
-	 * additional hand written constants. <!-- begin-user-doc --> <!--
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 25;
 
 	/**
-	 * A constant with a fixed name that can be used as the base value for
-	 * additional hand written constants in a derived class. <!-- begin-user-doc
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
 
 	/**
-	 * Delegates evaluation of the given invariant expression against the object
-	 * in the given context. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Delegates evaluation of the given invariant expression against the object in the given context.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public static boolean validate(EClass eClass, EObject eObject,
 			DiagnosticChain diagnostics, Map<Object, Object> context,
 			String validationDelegate, EOperation invariant, String expression,
 			int severity, String source, int code) {
-		return EObjectValidator.validate(eClass, eObject, diagnostics, context,
-				validationDelegate, invariant, expression, severity, source,
-				code);
+		return EObjectValidator.validate(eClass, eObject, diagnostics, context, validationDelegate, invariant, expression, severity, source, code);
 	}
 
 	/**
-	 * Creates an instance of the switch. <!-- begin-user-doc --> <!--
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DGValidator() {
@@ -322,179 +297,146 @@ public class DGValidator extends EObjectValidator {
 	}
 
 	/**
-	 * Returns the package of this validator switch. <!-- begin-user-doc -->
+	 * Returns the package of this validator switch.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	protected EPackage getEPackage() {
-		return DGPackage.eINSTANCE;
+	  return DGPackage.eINSTANCE;
 	}
 
 	/**
-	 * Calls <code>validateXXX</code> for the corresponding classifier of the
-	 * model. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	protected boolean validate(int classifierID, Object value,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
 		switch (classifierID) {
-		case DGPackage.CANVAS:
-			return validateCanvas((Canvas) value, diagnostics, context);
-		case DGPackage.GROUP:
-			return validateGroup((Group) value, diagnostics, context);
-		case DGPackage.GRAPHICAL_ELEMENT:
-			return validateGraphicalElement((GraphicalElement) value,
-					diagnostics, context);
-		case DGPackage.DEFINITION:
-			return validateDefinition((Definition) value, diagnostics, context);
-		case DGPackage.MOVE_TO:
-			return validateMoveTo((MoveTo) value, diagnostics, context);
-		case DGPackage.PATH_COMMAND:
-			return validatePathCommand((PathCommand) value, diagnostics,
-					context);
-		case DGPackage.CLIP_PATH:
-			return validateClipPath((ClipPath) value, diagnostics, context);
-		case DGPackage.STYLE:
-			return validateStyle((Style) value, diagnostics, context);
-		case DGPackage.PAINT:
-			return validatePaint((Paint) value, diagnostics, context);
-		case DGPackage.PAINT_SERVER:
-			return validatePaintServer((PaintServer) value, diagnostics,
-					context);
-		case DGPackage.TRANSFORM:
-			return validateTransform((Transform) value, diagnostics, context);
-		case DGPackage.CIRCLE:
-			return validateCircle((Circle) value, diagnostics, context);
-		case DGPackage.CLOSE_PATH:
-			return validateClosePath((ClosePath) value, diagnostics, context);
-		case DGPackage.CUBIC_CURVE_TO:
-			return validateCubicCurveTo((CubicCurveTo) value, diagnostics,
-					context);
-		case DGPackage.DEFINITIONS:
-			return validateDefinitions((Definitions) value, diagnostics,
-					context);
-		case DGPackage.STYLE_SHEET:
-			return validateStyleSheet((StyleSheet) value, diagnostics, context);
-		case DGPackage.STYLE_RULE:
-			return validateStyleRule((StyleRule) value, diagnostics, context);
-		case DGPackage.STYLE_SELECTOR:
-			return validateStyleSelector((StyleSelector) value, diagnostics,
-					context);
-		case DGPackage.ELLIPSE:
-			return validateEllipse((Ellipse) value, diagnostics, context);
-		case DGPackage.ELLIPTICAL_ARC_TO:
-			return validateEllipticalArcTo((EllipticalArcTo) value,
-					diagnostics, context);
-		case DGPackage.QUADRATIC_CURVE_TO:
-			return validateQuadraticCurveTo((QuadraticCurveTo) value,
-					diagnostics, context);
-		case DGPackage.GRADIENT:
-			return validateGradient((Gradient) value, diagnostics, context);
-		case DGPackage.GRADIENT_STOP:
-			return validateGradientStop((GradientStop) value, diagnostics,
-					context);
-		case DGPackage.IMAGE:
-			return validateImage((Image) value, diagnostics, context);
-		case DGPackage.LINE:
-			return validateLine((Line) value, diagnostics, context);
-		case DGPackage.MARKED_ELEMENT:
-			return validateMarkedElement((MarkedElement) value, diagnostics,
-					context);
-		case DGPackage.MARKER:
-			return validateMarker((Marker) value, diagnostics, context);
-		case DGPackage.LINEAR_GRADIENT:
-			return validateLinearGradient((LinearGradient) value, diagnostics,
-					context);
-		case DGPackage.LINE_TO:
-			return validateLineTo((LineTo) value, diagnostics, context);
-		case DGPackage.MATRIX:
-			return validateMatrix((Matrix) value, diagnostics, context);
-		case DGPackage.PATH:
-			return validatePath((Path) value, diagnostics, context);
-		case DGPackage.PATTERN:
-			return validatePattern((Pattern) value, diagnostics, context);
-		case DGPackage.POLYGON:
-			return validatePolygon((Polygon) value, diagnostics, context);
-		case DGPackage.POLYLINE:
-			return validatePolyline((Polyline) value, diagnostics, context);
-		case DGPackage.RADIAL_GRADIENT:
-			return validateRadialGradient((RadialGradient) value, diagnostics,
-					context);
-		case DGPackage.RECTANGLE:
-			return validateRectangle((Rectangle) value, diagnostics, context);
-		case DGPackage.ROOT_CANVAS:
-			return validateRootCanvas((RootCanvas) value, diagnostics, context);
-		case DGPackage.ROTATE:
-			return validateRotate((Rotate) value, diagnostics, context);
-		case DGPackage.SCALE:
-			return validateScale((Scale) value, diagnostics, context);
-		case DGPackage.SKEW:
-			return validateSkew((Skew) value, diagnostics, context);
-		case DGPackage.TEXT:
-			return validateText((Text) value, diagnostics, context);
-		case DGPackage.TRANSLATE:
-			return validateTranslate((Translate) value, diagnostics, context);
-		case DGPackage.USE:
-			return validateUse((Use) value, diagnostics, context);
-		case DGPackage.FONT_DECORATION:
-			return validateFontDecoration((FontDecoration) value, diagnostics,
-					context);
-		case DGPackage.ELEMENT_KIND:
-			return validateElementKind((ElementKind) value, diagnostics,
-					context);
-		default:
-			return true;
+			case DGPackage.CANVAS:
+				return validateCanvas((Canvas)value, diagnostics, context);
+			case DGPackage.GROUP:
+				return validateGroup((Group)value, diagnostics, context);
+			case DGPackage.GRAPHICAL_ELEMENT:
+				return validateGraphicalElement((GraphicalElement)value, diagnostics, context);
+			case DGPackage.DEFINITION:
+				return validateDefinition((Definition)value, diagnostics, context);
+			case DGPackage.MOVE_TO:
+				return validateMoveTo((MoveTo)value, diagnostics, context);
+			case DGPackage.PATH_COMMAND:
+				return validatePathCommand((PathCommand)value, diagnostics, context);
+			case DGPackage.CLIP_PATH:
+				return validateClipPath((ClipPath)value, diagnostics, context);
+			case DGPackage.STYLE:
+				return validateStyle((Style)value, diagnostics, context);
+			case DGPackage.PAINT:
+				return validatePaint((Paint)value, diagnostics, context);
+			case DGPackage.PAINT_SERVER:
+				return validatePaintServer((PaintServer)value, diagnostics, context);
+			case DGPackage.TRANSFORM:
+				return validateTransform((Transform)value, diagnostics, context);
+			case DGPackage.CIRCLE:
+				return validateCircle((Circle)value, diagnostics, context);
+			case DGPackage.CLOSE_PATH:
+				return validateClosePath((ClosePath)value, diagnostics, context);
+			case DGPackage.CUBIC_CURVE_TO:
+				return validateCubicCurveTo((CubicCurveTo)value, diagnostics, context);
+			case DGPackage.DEFINITIONS:
+				return validateDefinitions((Definitions)value, diagnostics, context);
+			case DGPackage.STYLE_SHEET:
+				return validateStyleSheet((StyleSheet)value, diagnostics, context);
+			case DGPackage.STYLE_RULE:
+				return validateStyleRule((StyleRule)value, diagnostics, context);
+			case DGPackage.STYLE_SELECTOR:
+				return validateStyleSelector((StyleSelector)value, diagnostics, context);
+			case DGPackage.ELLIPSE:
+				return validateEllipse((Ellipse)value, diagnostics, context);
+			case DGPackage.ELLIPTICAL_ARC_TO:
+				return validateEllipticalArcTo((EllipticalArcTo)value, diagnostics, context);
+			case DGPackage.QUADRATIC_CURVE_TO:
+				return validateQuadraticCurveTo((QuadraticCurveTo)value, diagnostics, context);
+			case DGPackage.GRADIENT:
+				return validateGradient((Gradient)value, diagnostics, context);
+			case DGPackage.GRADIENT_STOP:
+				return validateGradientStop((GradientStop)value, diagnostics, context);
+			case DGPackage.IMAGE:
+				return validateImage((Image)value, diagnostics, context);
+			case DGPackage.LINE:
+				return validateLine((Line)value, diagnostics, context);
+			case DGPackage.MARKED_ELEMENT:
+				return validateMarkedElement((MarkedElement)value, diagnostics, context);
+			case DGPackage.MARKER:
+				return validateMarker((Marker)value, diagnostics, context);
+			case DGPackage.LINEAR_GRADIENT:
+				return validateLinearGradient((LinearGradient)value, diagnostics, context);
+			case DGPackage.LINE_TO:
+				return validateLineTo((LineTo)value, diagnostics, context);
+			case DGPackage.MATRIX:
+				return validateMatrix((Matrix)value, diagnostics, context);
+			case DGPackage.PATH:
+				return validatePath((Path)value, diagnostics, context);
+			case DGPackage.PATTERN:
+				return validatePattern((Pattern)value, diagnostics, context);
+			case DGPackage.POLYGON:
+				return validatePolygon((Polygon)value, diagnostics, context);
+			case DGPackage.POLYLINE:
+				return validatePolyline((Polyline)value, diagnostics, context);
+			case DGPackage.RADIAL_GRADIENT:
+				return validateRadialGradient((RadialGradient)value, diagnostics, context);
+			case DGPackage.RECTANGLE:
+				return validateRectangle((Rectangle)value, diagnostics, context);
+			case DGPackage.ROOT_CANVAS:
+				return validateRootCanvas((RootCanvas)value, diagnostics, context);
+			case DGPackage.ROTATE:
+				return validateRotate((Rotate)value, diagnostics, context);
+			case DGPackage.SCALE:
+				return validateScale((Scale)value, diagnostics, context);
+			case DGPackage.SKEW:
+				return validateSkew((Skew)value, diagnostics, context);
+			case DGPackage.TEXT:
+				return validateText((Text)value, diagnostics, context);
+			case DGPackage.TRANSLATE:
+				return validateTranslate((Translate)value, diagnostics, context);
+			case DGPackage.USE:
+				return validateUse((Use)value, diagnostics, context);
+			case DGPackage.FONT_DECORATION:
+				return validateFontDecoration((FontDecoration)value, diagnostics, context);
+			case DGPackage.ELEMENT_KIND:
+				return validateElementKind((ElementKind)value, diagnostics, context);
+			case DGPackage.TEXT_ANCHOR:
+				return validateTextAnchor((TextAnchor)value, diagnostics, context);
+			default:
+				return true;
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateCanvas(Canvas canvas, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(canvas, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(canvas,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(canvas, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(canvas, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(canvas,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(canvas, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(canvas, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(canvas, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(canvas, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(canvas, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(canvas,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateCanvas_canvasCannotHaveTransforms(canvas,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(canvas, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(canvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(canvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(canvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(canvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(canvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(canvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(canvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(canvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(canvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(canvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validateCanvas_canvasCannotHaveTransforms(canvas, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * Validates the canvasCannotHaveTransforms constraint of '<em>Canvas</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateCanvas_canvasCannotHaveTransforms(Canvas canvas,
@@ -504,79 +446,41 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateGroup(Group group, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(group, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(group, diagnostics,
-				context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(group, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(group, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(group,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(group, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(group, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(group, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(group, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(group, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(group,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(group, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(group, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(group, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(group, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(group, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(group, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(group, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(group, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(group, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(group, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(group, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateGraphicalElement(GraphicalElement graphicalElement,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(graphicalElement, diagnostics,
-				context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(graphicalElement,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(graphicalElement,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(graphicalElement,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-					graphicalElement, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(graphicalElement,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(graphicalElement, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(graphicalElement, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(graphicalElement,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(graphicalElement,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(
-					graphicalElement, diagnostics, context);
+		if (!validate_NoCircularContainment(graphicalElement, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(graphicalElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(graphicalElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(graphicalElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(graphicalElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(graphicalElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(graphicalElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(graphicalElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(graphicalElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(graphicalElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(graphicalElement, diagnostics, context);
 		return result;
 	}
 
@@ -595,37 +499,20 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateDefinition(Definition definition,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(definition, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(definition,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(definition, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(definition,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(definition,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(definition, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(definition, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(definition, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(definition, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(definition,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(definition, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(definition, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(definition, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(definition, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(definition, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(definition, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(definition, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(definition, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(definition, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(definition, diagnostics, context);
 		return result;
 	}
 
@@ -642,85 +529,44 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateClipPath(ClipPath clipPath,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(clipPath, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(clipPath,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(clipPath, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(clipPath, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(clipPath,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(clipPath, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(clipPath, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(clipPath, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(clipPath, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(clipPath, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(
-					clipPath, diagnostics, context);
+		if (!validate_NoCircularContainment(clipPath, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(clipPath, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(clipPath, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(clipPath, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(clipPath, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(clipPath, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(clipPath, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(clipPath, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(clipPath, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(clipPath, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(clipPath, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateStyle(Style style, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(style, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(style, diagnostics,
-				context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(style, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(style, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(style,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(style, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(style, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(style, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(style, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateStyle_validFontSize(style, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateStyle_validFillOpacity(style, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateStyle_validStrokeWidth(style, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateStyle_validDashLengthSize(style, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateStyle_validStrokeOpacity(style, diagnostics,
-					context);
+		if (!validate_NoCircularContainment(style, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(style, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(style, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(style, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(style, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(style, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(style, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(style, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(style, diagnostics, context);
+		if (result || diagnostics != null) result &= validateStyle_validFontSize(style, diagnostics, context);
+		if (result || diagnostics != null) result &= validateStyle_validFillOpacity(style, diagnostics, context);
+		if (result || diagnostics != null) result &= validateStyle_validStrokeWidth(style, diagnostics, context);
+		if (result || diagnostics != null) result &= validateStyle_validDashLengthSize(style, diagnostics, context);
+		if (result || diagnostics != null) result &= validateStyle_validStrokeOpacity(style, diagnostics, context);
 		return result;
 	}
 
@@ -781,42 +627,26 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validatePaint(Paint paint, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(paint, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(paint, diagnostics,
-				context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(paint, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(paint, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(paint,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(paint, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(paint, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(paint, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(paint, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validatePaint_referencedPaintServerHasId(paint,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(paint, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(paint, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(paint, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(paint, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(paint, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(paint, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(paint, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(paint, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(paint, diagnostics, context);
+		if (result || diagnostics != null) result &= validatePaint_referencedPaintServerHasId(paint, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * Validates the referencedPaintServerHasId constraint of '<em>Paint</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validatePaint_referencedPaintServerHasId(Paint paint,
@@ -826,43 +656,25 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validatePaintServer(PaintServer paintServer,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(paintServer, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(paintServer,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(paintServer, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(paintServer,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(paintServer,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(paintServer, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(paintServer, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(paintServer, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(paintServer, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(paintServer,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(paintServer, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(paintServer, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(paintServer, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(paintServer, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(paintServer, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(paintServer, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(paintServer, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(paintServer, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(paintServer, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(paintServer, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateTransform(Transform transform,
@@ -872,77 +684,53 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateDefinitions(Definitions definitions,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(definitions, diagnostics,
-				context);
+		return validate_EveryDefaultConstraint(definitions, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateCubicCurveTo(CubicCurveTo cubicCurveTo,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(cubicCurveTo, diagnostics,
-				context);
+		return validate_EveryDefaultConstraint(cubicCurveTo, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validatePathCommand(PathCommand pathCommand,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(pathCommand, diagnostics,
-				context);
+		return validate_EveryDefaultConstraint(pathCommand, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateMarker(Marker marker, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(marker, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(marker,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(marker, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(marker, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(marker,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(marker, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(marker, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(marker, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(marker, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(marker, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(marker,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(marker, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(marker, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(marker, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(marker, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(marker, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(marker, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(marker, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(marker, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(marker, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(marker, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(marker, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateStyleSheet(StyleSheet styleSheet,
@@ -952,7 +740,6 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateStyleRule(StyleRule styleRule,
@@ -962,52 +749,31 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateStyleSelector(StyleSelector styleSelector,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(styleSelector, diagnostics,
-				context);
+		return validate_EveryDefaultConstraint(styleSelector, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateCircle(Circle circle, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(circle, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(circle,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(circle, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(circle, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(circle,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(circle, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(circle, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(circle, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(circle, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(circle, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(circle,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateCircle_nonNegativeRadius(circle, diagnostics,
-					context);
+		if (!validate_NoCircularContainment(circle, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(circle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(circle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(circle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(circle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(circle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(circle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(circle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(circle, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(circle, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(circle, diagnostics, context);
+		if (result || diagnostics != null) result &= validateCircle_nonNegativeRadius(circle, diagnostics, context);
 		return result;
 	}
 
@@ -1024,7 +790,6 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateClosePath(ClosePath closePath,
@@ -1034,137 +799,78 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateEllipse(Ellipse ellipse,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(ellipse, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(ellipse,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(ellipse, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(ellipse, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(ellipse,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(ellipse, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(ellipse, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(ellipse, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(ellipse, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(ellipse, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(ellipse,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(ellipse, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(ellipse, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(ellipse, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(ellipse, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(ellipse, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(ellipse, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(ellipse, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(ellipse, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(ellipse, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(ellipse, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(ellipse, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateEllipticalArcTo(EllipticalArcTo ellipticalArcTo,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(ellipticalArcTo, diagnostics,
-				context);
+		return validate_EveryDefaultConstraint(ellipticalArcTo, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateQuadraticCurveTo(QuadraticCurveTo quadraticCurveTo,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return validate_EveryDefaultConstraint(quadraticCurveTo, diagnostics,
-				context);
+		return validate_EveryDefaultConstraint(quadraticCurveTo, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateGradient(Gradient gradient,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(gradient, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(gradient,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(gradient, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(gradient, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(gradient,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(gradient, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(gradient, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(gradient, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(gradient, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(gradient, diagnostics,
-					context);
+		if (!validate_NoCircularContainment(gradient, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(gradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(gradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(gradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(gradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(gradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(gradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(gradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(gradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(gradient, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateGradientStop(GradientStop gradientStop,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(gradientStop, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(gradientStop,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(gradientStop,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(gradientStop,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-					gradientStop, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(gradientStop, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(gradientStop, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(gradientStop, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(gradientStop, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGradientStop_validOffset(gradientStop,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateGradientStop_validOpacity(gradientStop,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(gradientStop, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(gradientStop, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(gradientStop, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(gradientStop, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(gradientStop, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(gradientStop, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(gradientStop, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(gradientStop, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(gradientStop, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGradientStop_validOffset(gradientStop, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGradientStop_validOpacity(gradientStop, diagnostics, context);
 		return result;
 	}
 
@@ -1192,41 +898,22 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateImage(Image image, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(image, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(image, diagnostics,
-				context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(image, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(image, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(image,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(image, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(image, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(image, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(image, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(image, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(image,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateImage_sourceCannotBeEmpty(image, diagnostics,
-					context);
+		if (!validate_NoCircularContainment(image, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(image, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(image, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(image, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(image, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(image, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(image, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(image, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(image, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(image, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(image, diagnostics, context);
+		if (result || diagnostics != null) result &= validateImage_sourceCannotBeEmpty(image, diagnostics, context);
 		return result;
 	}
 
@@ -1243,103 +930,53 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateLine(Line line, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(line, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(line, diagnostics,
-				context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(line, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(line, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(line,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(line, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(line, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(line, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(line, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(line, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(line,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedStartMarkerHasId(line,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedMidMarkerHasId(line,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedEndMarkerHasId(line,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(line, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(line, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(line, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(line, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(line, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(line, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(line, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(line, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(line, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(line, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(line, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedStartMarkerHasId(line, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedMidMarkerHasId(line, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedEndMarkerHasId(line, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateMarkedElement(MarkedElement markedElement,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(markedElement, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(markedElement,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(markedElement,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(markedElement,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-					markedElement, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(markedElement, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(markedElement, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(markedElement, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(markedElement, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(markedElement,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(
-					markedElement, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedStartMarkerHasId(
-					markedElement, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedMidMarkerHasId(
-					markedElement, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedEndMarkerHasId(
-					markedElement, diagnostics, context);
+		if (!validate_NoCircularContainment(markedElement, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(markedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(markedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(markedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(markedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(markedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(markedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(markedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(markedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(markedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(markedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedStartMarkerHasId(markedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedMidMarkerHasId(markedElement, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedEndMarkerHasId(markedElement, diagnostics, context);
 		return result;
 	}
 
 	/**
-	 * Validates the referencedStartMarkerHasId constraint of '
-	 * <em>Marked Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Validates the referencedStartMarkerHasId constraint of '<em>Marked Element</em>'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public boolean validateMarkedElement_referencedStartMarkerHasId(
@@ -1349,9 +986,8 @@ public class DGValidator extends EObjectValidator {
 	}
 
 	/**
-	 * Validates the referencedMidMarkerHasId constraint of '
-	 * <em>Marked Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Validates the referencedMidMarkerHasId constraint of '<em>Marked Element</em>'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public boolean validateMarkedElement_referencedMidMarkerHasId(
@@ -1361,9 +997,8 @@ public class DGValidator extends EObjectValidator {
 	}
 
 	/**
-	 * Validates the referencedEndMarkerHasId constraint of '
-	 * <em>Marked Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Validates the referencedEndMarkerHasId constraint of '<em>Marked Element</em>'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public boolean validateMarkedElement_referencedEndMarkerHasId(
@@ -1374,49 +1009,27 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateLinearGradient(LinearGradient linearGradient,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(linearGradient, diagnostics,
-				context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(linearGradient,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(linearGradient,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(linearGradient,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-					linearGradient, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(linearGradient, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(linearGradient, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(linearGradient, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(linearGradient, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(linearGradient,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateLinearGradient_validGradientVector(
-					linearGradient, diagnostics, context);
+		if (!validate_NoCircularContainment(linearGradient, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(linearGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(linearGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(linearGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(linearGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(linearGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(linearGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(linearGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(linearGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(linearGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validateLinearGradient_validGradientVector(linearGradient, diagnostics, context);
 		return result;
 	}
 
 	/**
-	 * Validates the validGradientVector constraint of '<em>Linear Gradient</em>
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Validates the validGradientVector constraint of '<em>Linear Gradient</em>'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	public boolean validateLinearGradient_validGradientVector(
@@ -1427,7 +1040,6 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateLineTo(LineTo lineTo, DiagnosticChain diagnostics,
@@ -1437,7 +1049,6 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateMatrix(Matrix matrix, DiagnosticChain diagnostics,
@@ -1447,7 +1058,6 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateMoveTo(MoveTo moveTo, DiagnosticChain diagnostics,
@@ -1457,50 +1067,25 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validatePath(Path path, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(path, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(path, diagnostics,
-				context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(path, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(path, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(path,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(path, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(path, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(path, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(path, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(path, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(path,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedStartMarkerHasId(path,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedMidMarkerHasId(path,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedEndMarkerHasId(path,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validatePath_firstCommandMustBeMove(path, diagnostics,
-					context);
+		if (!validate_NoCircularContainment(path, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedStartMarkerHasId(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedMidMarkerHasId(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedEndMarkerHasId(path, diagnostics, context);
+		if (result || diagnostics != null) result &= validatePath_firstCommandMustBeMove(path, diagnostics, context);
 		return result;
 	}
 
@@ -1517,185 +1102,94 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validatePattern(Pattern pattern,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(pattern, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(pattern,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(pattern, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(pattern, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(pattern,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(pattern, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(pattern, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(pattern, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(pattern, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(pattern, diagnostics,
-					context);
+		if (!validate_NoCircularContainment(pattern, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(pattern, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(pattern, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(pattern, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(pattern, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(pattern, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(pattern, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(pattern, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(pattern, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(pattern, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validatePolygon(Polygon polygon,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(polygon, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(polygon,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(polygon, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(polygon, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(polygon,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(polygon, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(polygon, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(polygon, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(polygon, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(polygon, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(polygon,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedStartMarkerHasId(polygon,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedMidMarkerHasId(polygon,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedEndMarkerHasId(polygon,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(polygon, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(polygon, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(polygon, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(polygon, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(polygon, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(polygon, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(polygon, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(polygon, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(polygon, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(polygon, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(polygon, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedStartMarkerHasId(polygon, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedMidMarkerHasId(polygon, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedEndMarkerHasId(polygon, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validatePolyline(Polyline polyline,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(polyline, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(polyline,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(polyline, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(polyline, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(polyline,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(polyline, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(polyline, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(polyline, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(polyline, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(polyline, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(
-					polyline, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedStartMarkerHasId(
-					polyline, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedMidMarkerHasId(polyline,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateMarkedElement_referencedEndMarkerHasId(polyline,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(polyline, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(polyline, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(polyline, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(polyline, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(polyline, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(polyline, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(polyline, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(polyline, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(polyline, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(polyline, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(polyline, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedStartMarkerHasId(polyline, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedMidMarkerHasId(polyline, diagnostics, context);
+		if (result || diagnostics != null) result &= validateMarkedElement_referencedEndMarkerHasId(polyline, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateRadialGradient(RadialGradient radialGradient,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(radialGradient, diagnostics,
-				context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(radialGradient,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(radialGradient,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(radialGradient,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(
-					radialGradient, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(radialGradient, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(radialGradient, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(radialGradient, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(radialGradient, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(radialGradient,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateRadialGradient_validCenterPoint(radialGradient,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateRadialGradient_validFocusPoint(radialGradient,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateRadialGradient_validRadius(radialGradient,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(radialGradient, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(radialGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(radialGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(radialGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(radialGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(radialGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(radialGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(radialGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(radialGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(radialGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validateRadialGradient_validCenterPoint(radialGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validateRadialGradient_validFocusPoint(radialGradient, diagnostics, context);
+		if (result || diagnostics != null) result &= validateRadialGradient_validRadius(radialGradient, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * Validates the validCenterPoint constraint of '<em>Radial Gradient</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateRadialGradient_validCenterPoint(
@@ -1707,7 +1201,6 @@ public class DGValidator extends EObjectValidator {
 	/**
 	 * Validates the validFocusPoint constraint of '<em>Radial Gradient</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateRadialGradient_validFocusPoint(
@@ -1730,50 +1223,28 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateRectangle(Rectangle rectangle,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(rectangle, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(rectangle,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(rectangle, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(rectangle,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(rectangle,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(rectangle, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(rectangle, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(rectangle, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(rectangle, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(rectangle,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(
-					rectangle, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateRectangle_nonNegativeCornerRadius(rectangle,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(rectangle, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(rectangle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(rectangle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(rectangle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(rectangle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(rectangle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(rectangle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(rectangle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(rectangle, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(rectangle, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(rectangle, diagnostics, context);
+		if (result || diagnostics != null) result &= validateRectangle_nonNegativeCornerRadius(rectangle, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * Validates the nonNegativeCornerRadius constraint of '<em>Rectangle</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateRectangle_nonNegativeCornerRadius(
@@ -1784,49 +1255,27 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateRootCanvas(RootCanvas rootCanvas,
 			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(rootCanvas, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(rootCanvas,
-				diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(rootCanvas, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(rootCanvas,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(rootCanvas,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(rootCanvas, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(rootCanvas, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(rootCanvas,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(
-					rootCanvas, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateCanvas_canvasCannotHaveTransforms(rootCanvas,
-					diagnostics, context);
+		if (!validate_NoCircularContainment(rootCanvas, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(rootCanvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(rootCanvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(rootCanvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(rootCanvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(rootCanvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(rootCanvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(rootCanvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(rootCanvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(rootCanvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(rootCanvas, diagnostics, context);
+		if (result || diagnostics != null) result &= validateCanvas_canvasCannotHaveTransforms(rootCanvas, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateRotate(Rotate rotate, DiagnosticChain diagnostics,
@@ -1836,35 +1285,20 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateScale(Scale scale, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(scale, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(scale, diagnostics,
-				context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(scale, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(scale, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(scale,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(scale, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(scale, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(scale, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(scale, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateScale_nonnegativescale(scale, diagnostics,
-					context);
+		if (!validate_NoCircularContainment(scale, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(scale, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(scale, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(scale, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(scale, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(scale, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(scale, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(scale, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(scale, diagnostics, context);
+		if (result || diagnostics != null) result &= validateScale_nonnegativescale(scale, diagnostics, context);
 		return result;
 	}
 
@@ -1881,7 +1315,6 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateSkew(Skew skew, DiagnosticChain diagnostics,
@@ -1891,40 +1324,22 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateText(Text text, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(text, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(text, diagnostics,
-				context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(text, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(text, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(text,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(text, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(text, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(text, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(text, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(text, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(text,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateText_dataCannotBeEmpty(text, diagnostics, context);
+		if (!validate_NoCircularContainment(text, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(text, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(text, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(text, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(text, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(text, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(text, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(text, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(text, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(text, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(text, diagnostics, context);
+		if (result || diagnostics != null) result &= validateText_dataCannotBeEmpty(text, diagnostics, context);
 		return result;
 	}
 
@@ -1941,7 +1356,6 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateTranslate(Translate translate,
@@ -1951,40 +1365,22 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateUse(Use use, DiagnosticChain diagnostics,
 			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(use, diagnostics, context))
-			return false;
-		boolean result = validate_EveryMultiplicityConforms(use, diagnostics,
-				context);
-		if (result || diagnostics != null)
-			result &= validate_EveryDataValueConforms(use, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryReferenceIsContained(use, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validate_EveryBidirectionalReferenceIsPaired(use,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryProxyResolves(use, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_UniqueID(use, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryKeyUnique(use, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validate_EveryMapEntryUnique(use, diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateDefinition_idCannotBeEmpty(use, diagnostics,
-					context);
-		if (result || diagnostics != null)
-			result &= validateGraphicalElement_referencedClippathHasId(use,
-					diagnostics, context);
-		if (result || diagnostics != null)
-			result &= validateUse_referencedElementHasId(use, diagnostics,
-					context);
+		if (!validate_NoCircularContainment(use, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(use, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(use, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(use, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(use, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(use, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(use, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(use, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(use, diagnostics, context);
+		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(use, diagnostics, context);
+		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(use, diagnostics, context);
+		if (result || diagnostics != null) result &= validateUse_referencedElementHasId(use, diagnostics, context);
 		return result;
 	}
 
@@ -2001,7 +1397,6 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateFontDecoration(FontDecoration fontDecoration,
@@ -2011,7 +1406,6 @@ public class DGValidator extends EObjectValidator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean validateElementKind(ElementKind elementKind,
@@ -2020,16 +1414,23 @@ public class DGValidator extends EObjectValidator {
 	}
 
 	/**
-	 * Returns the resource locator that will be used to fetch messages for this
-	 * validator's diagnostics. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateTextAnchor(TextAnchor textAnchor, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
 		// TODO
-		// Specialize this to return a resource locator for messages specific to
-		// this validator.
+		// Specialize this to return a resource locator for messages specific to this validator.
 		// Ensure that you remove @generated or mark it @generated NOT
 		return super.getResourceLocator();
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIFactory.java
index 0341b5f5509..9cfa5003a92 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIFactory.java
@@ -16,24 +16,23 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
  * create method for each non-abstract class of the model. <!-- end-user-doc -->
- * 
  * @see org.eclipse.papyrus.dd.di.DIPackage
  * @generated
  */
 public interface DIFactory extends EFactory {
 
 	/**
-	 * The singleton instance of the factory. <!-- begin-user-doc --> <!--
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	DIFactory eINSTANCE = org.eclipse.papyrus.dd.di.impl.DIFactoryImpl.init();
 
 	/**
-	 * Returns the package supported by this factory. <!-- begin-user-doc -->
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIPackage.java
index 1951c997361..898647d85e8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIPackage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIPackage.java
@@ -39,40 +39,38 @@ import org.eclipse.emf.ecore.EReference;
 public interface DIPackage extends EPackage {
 
 	/**
-	 * The package name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The package name.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	String eNAME = "di";
 
 	/**
-	 * The package namespace URI. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The package namespace URI.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	String eNS_URI = "http://www.omg.org/spec/DD/20110901/DI";
 
 	/**
-	 * The package namespace name. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The package namespace name.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	String eNS_PREFIX = "di";
 
 	/**
-	 * The singleton instance of the package. <!-- begin-user-doc --> <!--
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	DIPackage eINSTANCE = org.eclipse.papyrus.dd.di.impl.DIPackageImpl.init();
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl
-	 * <em>Diagram Element</em>}' class. <!-- begin-user-doc --> <!--
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl <em>Diagram Element</em>}' class.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.di.impl.DiagramElementImpl
 	 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getDiagramElement()
 	 * @generated
@@ -89,27 +87,26 @@ public interface DIPackage extends EPackage {
 	int DIAGRAM_ELEMENT__MODEL_ELEMENT = 0;
 
 	/**
-	 * The feature id for the '<em><b>Owning Element</b></em>' reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DIAGRAM_ELEMENT__OWNING_ELEMENT = 1;
+	int DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT = 1;
 
 	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DIAGRAM_ELEMENT__OWNED_ELEMENT = 2;
+	int DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT = 2;
 
 	/**
-	 * The feature id for the '<em><b>Local Style</b></em>' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Local Style</b></em>' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -125,13 +122,30 @@ public interface DIPackage extends EPackage {
 	int DIAGRAM_ELEMENT__SHARED_STYLE = 4;
 
 	/**
-	 * The number of structural features of the '<em>Diagram Element</em>'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIAGRAM_ELEMENT__TARGET_EDGE = 5;
+
+	/**
+	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DIAGRAM_ELEMENT_FEATURE_COUNT = 5;
+	int DIAGRAM_ELEMENT__SOURCE_EDGE = 6;
+
+	/**
+	 * The number of structural features of the '<em>Diagram Element</em>' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIAGRAM_ELEMENT_FEATURE_COUNT = 7;
 
 	/**
 	 * The number of operations of the '<em>Diagram Element</em>' class. <!--
@@ -143,10 +157,8 @@ public interface DIPackage extends EPackage {
 	int DIAGRAM_ELEMENT_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.di.impl.StyleImpl <em>Style</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.di.impl.StyleImpl <em>Style</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.di.impl.StyleImpl
 	 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getStyle()
 	 * @generated
@@ -172,10 +184,8 @@ public interface DIPackage extends EPackage {
 	int STYLE_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.di.impl.EdgeImpl <em>Edge</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl <em>Edge</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.di.impl.EdgeImpl
 	 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getEdge()
 	 * @generated
@@ -192,27 +202,26 @@ public interface DIPackage extends EPackage {
 	int EDGE__MODEL_ELEMENT = DIAGRAM_ELEMENT__MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Owning Element</b></em>' reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EDGE__OWNING_ELEMENT = DIAGRAM_ELEMENT__OWNING_ELEMENT;
+	int EDGE__OWNING_DIAGRAM_ELEMENT = DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EDGE__OWNED_ELEMENT = DIAGRAM_ELEMENT__OWNED_ELEMENT;
+	int EDGE__OWNED_DIAGRAM_ELEMENT = DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Local Style</b></em>' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Local Style</b></em>' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -228,31 +237,48 @@ public interface DIPackage extends EPackage {
 	int EDGE__SHARED_STYLE = DIAGRAM_ELEMENT__SHARED_STYLE;
 
 	/**
-	 * The feature id for the '<em><b>Source</b></em>' reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EDGE__SOURCE = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
+	int EDGE__TARGET_EDGE = DIAGRAM_ELEMENT__TARGET_EDGE;
 
 	/**
-	 * The feature id for the '<em><b>Target</b></em>' reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EDGE__TARGET = DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
+	int EDGE__SOURCE_EDGE = DIAGRAM_ELEMENT__SOURCE_EDGE;
 
 	/**
-	 * The feature id for the '<em><b>Waypoint</b></em>' containment reference
-	 * list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Source Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EDGE__SOURCE_DIAGRAM_ELEMENT = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Waypoint</b></em>' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int EDGE__WAYPOINT = DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Target Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int EDGE__WAYPOINT = DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
+	int EDGE__TARGET_DIAGRAM_ELEMENT = DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
 
 	/**
 	 * The number of structural features of the '<em>Edge</em>' class. <!--
@@ -273,10 +299,8 @@ public interface DIPackage extends EPackage {
 	int EDGE_OPERATION_COUNT = DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.di.impl.ShapeImpl <em>Shape</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.di.impl.ShapeImpl <em>Shape</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see org.eclipse.papyrus.dd.di.impl.ShapeImpl
 	 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getShape()
 	 * @generated
@@ -293,27 +317,26 @@ public interface DIPackage extends EPackage {
 	int SHAPE__MODEL_ELEMENT = DIAGRAM_ELEMENT__MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Owning Element</b></em>' reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SHAPE__OWNING_ELEMENT = DIAGRAM_ELEMENT__OWNING_ELEMENT;
+	int SHAPE__OWNING_DIAGRAM_ELEMENT = DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int SHAPE__OWNED_ELEMENT = DIAGRAM_ELEMENT__OWNED_ELEMENT;
+	int SHAPE__OWNED_DIAGRAM_ELEMENT = DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Local Style</b></em>' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Local Style</b></em>' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -329,9 +352,26 @@ public interface DIPackage extends EPackage {
 	int SHAPE__SHARED_STYLE = DIAGRAM_ELEMENT__SHARED_STYLE;
 
 	/**
+	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SHAPE__TARGET_EDGE = DIAGRAM_ELEMENT__TARGET_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int SHAPE__SOURCE_EDGE = DIAGRAM_ELEMENT__SOURCE_EDGE;
+
+	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -356,10 +396,8 @@ public interface DIPackage extends EPackage {
 	int SHAPE_OPERATION_COUNT = DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.di.impl.DiagramImpl <em>Diagram</em>}'
-	 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The meta object id for the '{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl <em>Diagram</em>}' class.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see org.eclipse.papyrus.dd.di.impl.DiagramImpl
 	 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getDiagram()
 	 * @generated
@@ -376,27 +414,26 @@ public interface DIPackage extends EPackage {
 	int DIAGRAM__MODEL_ELEMENT = SHAPE__MODEL_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Owning Element</b></em>' reference. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DIAGRAM__OWNING_ELEMENT = SHAPE__OWNING_ELEMENT;
+	int DIAGRAM__OWNING_DIAGRAM_ELEMENT = SHAPE__OWNING_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Owned Element</b></em>' reference list.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int DIAGRAM__OWNED_ELEMENT = SHAPE__OWNED_ELEMENT;
+	int DIAGRAM__OWNED_DIAGRAM_ELEMENT = SHAPE__OWNED_DIAGRAM_ELEMENT;
 
 	/**
-	 * The feature id for the '<em><b>Local Style</b></em>' containment
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The feature id for the '<em><b>Local Style</b></em>' reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
@@ -412,9 +449,26 @@ public interface DIPackage extends EPackage {
 	int DIAGRAM__SHARED_STYLE = SHAPE__SHARED_STYLE;
 
 	/**
+	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIAGRAM__TARGET_EDGE = SHAPE__TARGET_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int DIAGRAM__SOURCE_EDGE = SHAPE__SOURCE_EDGE;
+
+	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -466,10 +520,8 @@ public interface DIPackage extends EPackage {
 	int DIAGRAM_OPERATION_COUNT = SHAPE_OPERATION_COUNT + 0;
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.di.DiagramElement <em>Diagram Element</em>}
-	 * '. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.di.DiagramElement <em>Diagram Element</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Diagram Element</em>'.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement
 	 * @generated
@@ -477,11 +529,9 @@ public interface DIPackage extends EPackage {
 	EClass getDiagramElement();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.papyrus.dd.di.DiagramElement#getModelElement
-	 * <em>Model Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Model Element</em>'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.dd.di.DiagramElement#getModelElement <em>Model Element</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Model Element</em>'.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getModelElement()
 	 * @see #getDiagramElement()
 	 * @generated
@@ -489,36 +539,31 @@ public interface DIPackage extends EPackage {
 	EReference getDiagramElement_ModelElement();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningElement
-	 * <em>Owning Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Owning Element</em>'.
-	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getOwningElement()
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement <em>Owning Diagram Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Owning Diagram Element</em>'.
+	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement()
 	 * @see #getDiagramElement()
 	 * @generated
 	 */
-	EReference getDiagramElement_OwningElement();
+	EReference getDiagramElement_OwningDiagramElement();
 
 	/**
-	 * Returns the meta object for the reference list '
-	 * {@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedElement
-	 * <em>Owned Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference list '<em>Owned Element</em>'.
-	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getOwnedElement()
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement <em>Owned Diagram Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Owned Diagram Element</em>'.
+	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement()
 	 * @see #getDiagramElement()
 	 * @generated
 	 */
-	EReference getDiagramElement_OwnedElement();
+	EReference getDiagramElement_OwnedDiagramElement();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle
-	 * <em>Local Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference '
-	 *         <em>Local Style</em>'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle <em>Local Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Local Style</em>'.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle()
 	 * @see #getDiagramElement()
 	 * @generated
@@ -526,10 +571,8 @@ public interface DIPackage extends EPackage {
 	EReference getDiagramElement_LocalStyle();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle
-	 * <em>Shared Style</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle <em>Shared Style</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the reference '<em>Shared Style</em>'.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle()
 	 * @see #getDiagramElement()
@@ -538,6 +581,28 @@ public interface DIPackage extends EPackage {
 	EReference getDiagramElement_SharedStyle();
 
 	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge <em>Target Edge</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Target Edge</em>'.
+	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge()
+	 * @see #getDiagramElement()
+	 * @generated
+	 */
+	EReference getDiagramElement_TargetEdge();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge <em>Source Edge</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Source Edge</em>'.
+	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge()
+	 * @see #getDiagramElement()
+	 * @generated
+	 */
+	EReference getDiagramElement_SourceEdge();
+
+	/**
 	 * Returns the meta object for class '
 	 * {@link org.eclipse.papyrus.dd.di.Style <em>Style</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -549,9 +614,8 @@ public interface DIPackage extends EPackage {
 	EClass getStyle();
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.di.Edge
-	 * <em>Edge</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.di.Edge <em>Edge</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Edge</em>'.
 	 * @see org.eclipse.papyrus.dd.di.Edge
 	 * @generated
@@ -559,41 +623,36 @@ public interface DIPackage extends EPackage {
 	EClass getEdge();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.papyrus.dd.di.Edge#getSource <em>Source</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Source</em>'.
-	 * @see org.eclipse.papyrus.dd.di.Edge#getSource()
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement <em>Source Diagram Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Source Diagram Element</em>'.
+	 * @see org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement()
 	 * @see #getEdge()
 	 * @generated
 	 */
-	EReference getEdge_Source();
+	EReference getEdge_SourceDiagramElement();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.papyrus.dd.di.Edge#getTarget <em>Target</em>}'. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the reference '<em>Target</em>'.
-	 * @see org.eclipse.papyrus.dd.di.Edge#getTarget()
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.di.Edge#getWaypoint <em>Waypoint</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Waypoint</em>'.
+	 * @see org.eclipse.papyrus.dd.di.Edge#getWaypoint()
 	 * @see #getEdge()
 	 * @generated
 	 */
-	EReference getEdge_Target();
+	EReference getEdge_Waypoint();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.papyrus.dd.di.Edge#getWaypoint <em>Waypoint</em>}'.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @return the meta object for the containment reference list '
-	 *         <em>Waypoint</em>'.
-	 * @see org.eclipse.papyrus.dd.di.Edge#getWaypoint()
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement <em>Target Diagram Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Target Diagram Element</em>'.
+	 * @see org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement()
 	 * @see #getEdge()
 	 * @generated
 	 */
-	EReference getEdge_Waypoint();
+	EReference getEdge_TargetDiagramElement();
 
 	/**
 	 * Returns the meta object for class '
@@ -619,10 +678,8 @@ public interface DIPackage extends EPackage {
 	EAttribute getDiagram_Name();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.di.Diagram#getDocumentation
-	 * <em>Documentation</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.di.Diagram#getDocumentation <em>Documentation</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Documentation</em>'.
 	 * @see org.eclipse.papyrus.dd.di.Diagram#getDocumentation()
 	 * @see #getDiagram()
@@ -631,10 +688,8 @@ public interface DIPackage extends EPackage {
 	EAttribute getDiagram_Documentation();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.di.Diagram#getResolution
-	 * <em>Resolution</em>}'. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.di.Diagram#getResolution <em>Resolution</em>}'.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Resolution</em>'.
 	 * @see org.eclipse.papyrus.dd.di.Diagram#getResolution()
 	 * @see #getDiagram()
@@ -685,17 +740,14 @@ public interface DIPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	interface Literals {
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl
-		 * <em>Diagram Element</em>}' class. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl <em>Diagram Element</em>}' class.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.di.impl.DiagramElementImpl
 		 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getDiagramElement()
 		 * @generated
@@ -703,56 +755,62 @@ public interface DIPackage extends EPackage {
 		EClass DIAGRAM_ELEMENT = eINSTANCE.getDiagramElement();
 
 		/**
-		 * The meta object literal for the '<em><b>Model Element</b></em>'
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Model Element</b></em>' reference list feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference DIAGRAM_ELEMENT__MODEL_ELEMENT = eINSTANCE
-				.getDiagramElement_ModelElement();
+		EReference DIAGRAM_ELEMENT__MODEL_ELEMENT = eINSTANCE.getDiagramElement_ModelElement();
 
 		/**
-		 * The meta object literal for the '<em><b>Owning Element</b></em>'
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Owning Diagram Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference DIAGRAM_ELEMENT__OWNING_ELEMENT = eINSTANCE
-				.getDiagramElement_OwningElement();
+		EReference DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT = eINSTANCE.getDiagramElement_OwningDiagramElement();
 
 		/**
-		 * The meta object literal for the '<em><b>Owned Element</b></em>'
-		 * reference list feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Owned Diagram Element</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference DIAGRAM_ELEMENT__OWNED_ELEMENT = eINSTANCE
-				.getDiagramElement_OwnedElement();
+		EReference DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT = eINSTANCE.getDiagramElement_OwnedDiagramElement();
 
 		/**
-		 * The meta object literal for the '<em><b>Local Style</b></em>'
-		 * containment reference feature. <!-- begin-user-doc --> <!--
+		 * The meta object literal for the '<em><b>Local Style</b></em>' reference feature.
+		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 * 
 		 * @generated
 		 */
-		EReference DIAGRAM_ELEMENT__LOCAL_STYLE = eINSTANCE
-				.getDiagramElement_LocalStyle();
+		EReference DIAGRAM_ELEMENT__LOCAL_STYLE = eINSTANCE.getDiagramElement_LocalStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Shared Style</b></em>' reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DIAGRAM_ELEMENT__SHARED_STYLE = eINSTANCE.getDiagramElement_SharedStyle();
 
 		/**
-		 * The meta object literal for the '<em><b>Shared Style</b></em>'
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Target Edge</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference DIAGRAM_ELEMENT__SHARED_STYLE = eINSTANCE
-				.getDiagramElement_SharedStyle();
+		EReference DIAGRAM_ELEMENT__TARGET_EDGE = eINSTANCE.getDiagramElement_TargetEdge();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.di.impl.StyleImpl <em>Style</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Source Edge</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference DIAGRAM_ELEMENT__SOURCE_EDGE = eINSTANCE.getDiagramElement_SourceEdge();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.di.impl.StyleImpl <em>Style</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.di.impl.StyleImpl
 		 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getStyle()
 		 * @generated
@@ -760,10 +818,8 @@ public interface DIPackage extends EPackage {
 		EClass STYLE = eINSTANCE.getStyle();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.di.impl.EdgeImpl <em>Edge</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl <em>Edge</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
 		 * @see org.eclipse.papyrus.dd.di.impl.EdgeImpl
 		 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getEdge()
 		 * @generated
@@ -771,35 +827,32 @@ public interface DIPackage extends EPackage {
 		EClass EDGE = eINSTANCE.getEdge();
 
 		/**
-		 * The meta object literal for the '<em><b>Source</b></em>' reference
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Source Diagram Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference EDGE__SOURCE = eINSTANCE.getEdge_Source();
+		EReference EDGE__SOURCE_DIAGRAM_ELEMENT = eINSTANCE.getEdge_SourceDiagramElement();
 
 		/**
-		 * The meta object literal for the '<em><b>Target</b></em>' reference
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Waypoint</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc --> <!--
+		 * end-user-doc -->
 		 * @generated
 		 */
-		EReference EDGE__TARGET = eINSTANCE.getEdge_Target();
+		EReference EDGE__WAYPOINT = eINSTANCE.getEdge_Waypoint();
 
 		/**
-		 * The meta object literal for the '<em><b>Waypoint</b></em>'
-		 * containment reference list feature. <!-- begin-user-doc --> <!--
-		 * end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Target Diagram Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference EDGE__WAYPOINT = eINSTANCE.getEdge_Waypoint();
+		EReference EDGE__TARGET_DIAGRAM_ELEMENT = eINSTANCE.getEdge_TargetDiagramElement();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.di.impl.DiagramImpl <em>Diagram</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl <em>Diagram</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.di.impl.DiagramImpl
 		 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getDiagram()
 		 * @generated
@@ -807,35 +860,29 @@ public interface DIPackage extends EPackage {
 		EClass DIAGRAM = eINSTANCE.getDiagram();
 
 		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute
-		 * feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute DIAGRAM__NAME = eINSTANCE.getDiagram_Name();
 
 		/**
-		 * The meta object literal for the '<em><b>Documentation</b></em>'
-		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Documentation</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute DIAGRAM__DOCUMENTATION = eINSTANCE
-				.getDiagram_Documentation();
+		EAttribute DIAGRAM__DOCUMENTATION = eINSTANCE.getDiagram_Documentation();
 
 		/**
-		 * The meta object literal for the '<em><b>Resolution</b></em>'
-		 * attribute feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Resolution</b></em>' attribute feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EAttribute DIAGRAM__RESOLUTION = eINSTANCE.getDiagram_Resolution();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.di.impl.ShapeImpl <em>Shape</em>}'
-		 * class. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.di.impl.ShapeImpl <em>Shape</em>}' class.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.papyrus.dd.di.impl.ShapeImpl
 		 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getShape()
 		 * @generated
@@ -843,9 +890,8 @@ public interface DIPackage extends EPackage {
 		EClass SHAPE = eINSTANCE.getShape();
 
 		/**
-		 * The meta object literal for the '<em><b>Bounds</b></em>' containment
-		 * reference feature. <!-- begin-user-doc --> <!-- end-user-doc -->
-		 * 
+		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @generated
 		 */
 		EReference SHAPE__BOUNDS = eINSTANCE.getShape_Bounds();
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java
index b689fe7bf6d..753a5b5f421 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java
@@ -14,23 +14,20 @@ package org.eclipse.papyrus.dd.di;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Diagram</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Diagram is an abstract container of a graph of
- * diagram elements. Diagrams are diagram elements with an origin point in the
- * x-y coordinate system. Their elements are laid out relative to their origin
- * point. <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Diagram is an abstract container of a graph of diagram elements. Diagrams are diagram elements with an origin point in the x-y coordinate system. Their elements are laid out relative to their origin point.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.di.Diagram#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.Diagram#getDocumentation <em>
- * Documentation</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.Diagram#getResolution <em>Resolution
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.Diagram#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.Diagram#getDocumentation <em>Documentation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.Diagram#getResolution <em>Resolution</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagram()
  * @model abstract="true"
  * @generated
@@ -38,25 +35,24 @@ package org.eclipse.papyrus.dd.di;
 public interface Diagram extends Shape {
 
 	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute. The default
-	 * value is <code>""</code>. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * <!-- begin-model-doc --> the name of the diagram. <!-- end-model-doc -->
-	 * 
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * The default value is <code>""</code>.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * the name of the diagram.
+	 * <!-- end-model-doc -->
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagram_Name()
-	 * @model default="" dataType="org.eclipse.papyrus.dd.dc.String"
-	 *        required="true" ordered="false"
+	 * @model default="" dataType="org.eclipse.papyrus.dd.dc.String" required="true" ordered="false"
 	 * @generated
 	 */
 	String getName();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.di.Diagram#getName
-	 * <em>Name</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Name</em>' attribute.
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.di.Diagram#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
 	 */
@@ -78,13 +74,10 @@ public interface Diagram extends Shape {
 	String getDocumentation();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.di.Diagram#getDocumentation
-	 * <em>Documentation</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.di.Diagram#getDocumentation <em>Documentation</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Documentation</em>' attribute.
+	 * @param value the new value of the '<em>Documentation</em>' attribute.
 	 * @see #getDocumentation()
 	 * @generated
 	 */
@@ -106,13 +99,10 @@ public interface Diagram extends Shape {
 	double getResolution();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.di.Diagram#getResolution
-	 * <em>Resolution</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.di.Diagram#getResolution <em>Resolution</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Resolution</em>' attribute.
+	 * @param value the new value of the '<em>Resolution</em>' attribute.
 	 * @see #getResolution()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java
index 3be8491d81f..86b80e696ff 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java
@@ -18,28 +18,24 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Diagram Element</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> DiagramElement is the abstract super type of all
- * elements in diagrams, including diagrams themselves. When contained in a
- * diagram, diagram elements are laid out relative to the diagram?s origin. <!--
- * end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * DiagramElement is the abstract super type of all elements in diagrams, including diagrams themselves. When contained in a diagram, diagram elements are laid out relative to the diagram?s origin.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getModelElement <em>Model
- * Element</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningElement <em>
- * Owning Element</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedElement <em>Owned
- * Element</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle <em>Local
- * Style</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle <em>Shared
- * Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getModelElement <em>Model Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement <em>Owning Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement <em>Owned Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle <em>Local Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle <em>Shared Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge <em>Target Edge</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge <em>Source Edge</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement()
  * @model abstract="true"
  * @generated
@@ -47,56 +43,54 @@ import org.eclipse.emf.ecore.EObject;
 public interface DiagramElement extends EObject {
 
 	/**
-	 * Returns the value of the '<em><b>Model Element</b></em>' reference. This
-	 * feature is a derived union. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * <!-- begin-model-doc --> a reference to a depicted model element, which
-	 * can be any MOF-based element <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Model Element</em>' reference.
+	 * Returns the value of the '<em><b>Model Element</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
+	 * This feature is a derived union.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * a reference to a depicted model element, which can be any MOF-based element
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Model Element</em>' reference list.
 	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement_ModelElement()
 	 * @model transient="true" changeable="false" volatile="true" derived="true"
-	 *        ordered="false"
 	 * @generated
 	 */
-	EObject getModelElement();
+	EList<EObject> getModelElement();
 
 	/**
-	 * Returns the value of the '<em><b>Owning Element</b></em>' reference. It
-	 * is bidirectional and its opposite is '
-	 * {@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedElement
-	 * <em>Owned Element</em>}'. This feature is a derived union. <!--
-	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a
-	 * reference to the diagram element that directly owns this diagram element.
+	 * Returns the value of the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement <em>Owned Diagram Element</em>}'.
+	 * This feature is a derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * a reference to the diagram element that directly owns this diagram element.
 	 * <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Owning Element</em>' reference.
-	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement_OwningElement()
-	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getOwnedElement
-	 * @model opposite="ownedElement" transient="true" changeable="false"
-	 *        volatile="true" derived="true" ordered="false"
+	 * @return the value of the '<em>Owning Diagram Element</em>' reference.
+	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement_OwningDiagramElement()
+	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement
+	 * @model opposite="ownedDiagramElement" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
-	DiagramElement getOwningElement();
+	DiagramElement getOwningDiagramElement();
 
 	/**
-	 * Returns the value of the '<em><b>Owned Element</b></em>' reference list.
-	 * The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.di.DiagramElement}. It is bidirectional and
-	 * its opposite is '
-	 * {@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningElement
-	 * <em>Owning Element</em>}'. This feature is a derived union. <!--
-	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a
-	 * collection of diagram elements that are directly owned by this diagram
-	 * element. <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Owned Element</em>' reference list.
-	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement_OwnedElement()
-	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getOwningElement
-	 * @model opposite="owningElement" transient="true" changeable="false"
-	 *        volatile="true" derived="true" ordered="false"
+	 * Returns the value of the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.dd.di.DiagramElement}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement <em>Owning Diagram Element</em>}'.
+	 * This feature is a derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * a collection of diagram elements that are directly owned by this diagram element.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Owned Diagram Element</em>' reference list.
+	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement_OwnedDiagramElement()
+	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement
+	 * @model opposite="owningDiagramElement" transient="true" changeable="false" volatile="true" derived="true"
 	 * @generated
 	 */
-	EList<DiagramElement> getOwnedElement();
+	EList<DiagramElement> getOwnedDiagramElement();
 
 	/**
 	 * Returns the value of the '<em><b>Local Style</b></em>' containment
@@ -113,20 +107,6 @@ public interface DiagramElement extends EObject {
 	Style getLocalStyle();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle
-	 * <em>Local Style</em>}' containment reference. <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Local Style</em>' containment
-	 *            reference.
-	 * @see #getLocalStyle()
-	 * @generated
-	 */
-	void setLocalStyle(Style value);
-
-	/**
 	 * Returns the value of the '<em><b>Shared Style</b></em>' reference. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a
 	 * reference to an optional shared style element for this diagram element.
@@ -141,16 +121,39 @@ public interface DiagramElement extends EObject {
 	Style getSharedStyle();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle
-	 * <em>Shared Style</em>}' reference. <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Shared Style</em>' reference.
-	 * @see #getSharedStyle()
+	 * Returns the value of the '<em><b>Target Edge</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.dd.di.Edge}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement <em>Target Diagram Element</em>}'.
+	 * This feature is a derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * a collection of edges that reference this diagram element as a target.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Target Edge</em>' reference list.
+	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement_TargetEdge()
+	 * @see org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement
+	 * @model opposite="targetDiagramElement" transient="true" changeable="false" volatile="true" derived="true"
+	 * @generated
+	 */
+	EList<Edge> getTargetEdge();
+
+	/**
+	 * Returns the value of the '<em><b>Source Edge</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.dd.di.Edge}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement <em>Source Diagram Element</em>}'.
+	 * This feature is a derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * a collection of edges that reference this diagram element as a source.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Source Edge</em>' reference list.
+	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement_SourceEdge()
+	 * @see org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement
+	 * @model opposite="sourceDiagramElement" transient="true" changeable="false" volatile="true" derived="true"
 	 * @generated
 	 */
-	void setSharedStyle(Style value);
+	EList<Edge> getSourceEdge();
 
 } // DiagramElement
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java
index f766b5a43c5..81e284afb7e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java
@@ -18,21 +18,20 @@ import org.eclipse.papyrus.dd.dc.Point;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Edge</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Edge is a diagram element that renders as a
- * polyline, connecting a source diagram element to a target diagram element,
- * and is positioned relative to the origin of the diagram. <!-- end-model-doc
- * -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Edge is a diagram element that renders as a polyline, connecting a source diagram element to a target diagram element, and is positioned relative to the origin of the diagram.
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.di.Edge#getSource <em>Source</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.Edge#getTarget <em>Target</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.Edge#getWaypoint <em>Waypoint</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement <em>Source Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.Edge#getWaypoint <em>Waypoint</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement <em>Target Diagram Element</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.di.DIPackage#getEdge()
  * @model abstract="true"
  * @generated
@@ -40,32 +39,21 @@ import org.eclipse.papyrus.dd.dc.Point;
 public interface Edge extends DiagramElement {
 
 	/**
-	 * Returns the value of the '<em><b>Source</b></em>' reference. This feature
-	 * is a derived union. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-	 * begin-model-doc --> the edge's source diagram element, i.e. where the
-	 * edge starts from. <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Source</em>' reference.
-	 * @see org.eclipse.papyrus.dd.di.DIPackage#getEdge_Source()
-	 * @model required="true" transient="true" changeable="false"
-	 *        volatile="true" derived="true" ordered="false"
-	 * @generated
-	 */
-	DiagramElement getSource();
-
-	/**
-	 * Returns the value of the '<em><b>Target</b></em>' reference. This feature
-	 * is a derived union. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
-	 * begin-model-doc --> the edge's target diagram element, i.e. where the
-	 * edge ends at. <!-- end-model-doc -->
-	 * 
-	 * @return the value of the '<em>Target</em>' reference.
-	 * @see org.eclipse.papyrus.dd.di.DIPackage#getEdge_Target()
-	 * @model required="true" transient="true" changeable="false"
-	 *        volatile="true" derived="true" ordered="false"
+	 * Returns the value of the '<em><b>Source Diagram Element</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge <em>Source Edge</em>}'.
+	 * This feature is a derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * the edge's source diagram element, i.e. where the edge starts from.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Source Diagram Element</em>' reference.
+	 * @see org.eclipse.papyrus.dd.di.DIPackage#getEdge_SourceDiagramElement()
+	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge
+	 * @model opposite="sourceEdge" required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
 	 * @generated
 	 */
-	DiagramElement getTarget();
+	DiagramElement getSourceDiagramElement();
 
 	/**
 	 * Returns the value of the '<em><b>Waypoint</b></em>' containment reference
@@ -82,4 +70,21 @@ public interface Edge extends DiagramElement {
 	 */
 	EList<Point> getWaypoint();
 
+	/**
+	 * Returns the value of the '<em><b>Target Diagram Element</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge <em>Target Edge</em>}'.
+	 * This feature is a derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * the edge's target diagram element, i.e. where the edge ends at.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Target Diagram Element</em>' reference.
+	 * @see org.eclipse.papyrus.dd.di.DIPackage#getEdge_TargetDiagramElement()
+	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge
+	 * @model opposite="targetEdge" required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
+	 * @generated
+	 */
+	DiagramElement getTargetDiagramElement();
+
 } // Edge
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java
index c056f0b2d66..a5d90b9746a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java
@@ -16,17 +16,18 @@ import org.eclipse.papyrus.dd.dc.Bounds;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Shape</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Shape is a diagram element with given bounds that is
- * laid out relative to the origin of the diagram <!-- end-model-doc -->
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Shape is a diagram element with given bounds that is laid out relative to the origin of the diagram
+ * <!-- end-model-doc -->
+ *
  * <p>
  * The following features are supported:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.di.Shape#getBounds <em>Bounds</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.Shape#getBounds <em>Bounds</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @see org.eclipse.papyrus.dd.di.DIPackage#getShape()
  * @model abstract="true"
  * @generated
@@ -48,12 +49,10 @@ public interface Shape extends DiagramElement {
 	Bounds getBounds();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.dd.di.Shape#getBounds
-	 * <em>Bounds</em>}' containment reference. <!-- begin-user-doc --> <!--
+	 * Sets the value of the '{@link org.eclipse.papyrus.dd.di.Shape#getBounds <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @param value
-	 *            the new value of the '<em>Bounds</em>' containment reference.
+	 * @param value the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Style.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Style.java
index 7e96a1944f6..efc722356e6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Style.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Style.java
@@ -16,12 +16,12 @@ import org.eclipse.emf.ecore.EObject;
 /**
  * <!-- begin-user-doc --> A representation of the model object '
  * <em><b>Style</b></em>'. <!-- end-user-doc -->
- * 
- * <!-- begin-model-doc --> Style contains formatting properties that affect the
- * appearance or style of diagram elements, including diagram themselves. <!--
- * end-model-doc -->
- * 
- * 
+ *
+ * <!-- begin-model-doc -->
+ * Style contains formatting properties that affect the appearance or style of diagram elements, including diagram themselves.
+ * <!-- end-model-doc -->
+ *
+ *
  * @see org.eclipse.papyrus.dd.di.DIPackage#getStyle()
  * @model abstract="true"
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java
index efbffda162e..0f630896c72 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java
@@ -24,34 +24,33 @@ import org.eclipse.papyrus.dd.di.*;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
  * end-user-doc -->
- * 
  * @generated
  */
 public class DIFactoryImpl extends EFactoryImpl implements DIFactory {
 
 	/**
-	 * Creates the default factory implementation. <!-- begin-user-doc --> <!--
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public static DIFactory init() {
 		try {
-			DIFactory theDIFactory = (DIFactory) EPackage.Registry.INSTANCE
-					.getEFactory(DIPackage.eNS_URI);
+			DIFactory theDIFactory = (DIFactory)EPackage.Registry.INSTANCE.getEFactory(DIPackage.eNS_URI);
 			if (theDIFactory != null) {
 				return theDIFactory;
 			}
-		} catch (Exception exception) {
+		}
+		catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new DIFactoryImpl();
 	}
 
 	/**
-	 * Creates an instance of the factory. <!-- begin-user-doc --> <!--
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DIFactoryImpl() {
@@ -60,30 +59,26 @@ public class DIFactoryImpl extends EFactoryImpl implements DIFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
 		switch (eClass.getClassifierID()) {
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName()
-					+ "' is not a valid classifier");
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DIPackage getDIPackage() {
-		return (DIPackage) getEPackage();
+		return (DIPackage)getEPackage();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @deprecated
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java
index a8d4cdc3124..2d4258b812b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java
@@ -32,42 +32,36 @@ import org.eclipse.papyrus.dd.di.Style;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
  * end-user-doc -->
- * 
  * @generated
  */
 public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass diagramElementEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass styleEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass edgeEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass diagramEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private EClass shapeEClass = null;
@@ -93,7 +87,6 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -114,14 +107,10 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 * @generated
 	 */
 	public static DIPackage init() {
-		if (isInited)
-			return (DIPackage) EPackage.Registry.INSTANCE
-					.getEPackage(DIPackage.eNS_URI);
+		if (isInited) return (DIPackage)EPackage.Registry.INSTANCE.getEPackage(DIPackage.eNS_URI);
 
 		// Obtain or create and register package
-		DIPackageImpl theDIPackage = (DIPackageImpl) (EPackage.Registry.INSTANCE
-				.get(eNS_URI) instanceof DIPackageImpl ? EPackage.Registry.INSTANCE
-				.get(eNS_URI) : new DIPackageImpl());
+		DIPackageImpl theDIPackage = (DIPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DIPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DIPackageImpl());
 
 		isInited = true;
 
@@ -138,6 +127,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 		// Mark meta-data to indicate it can't be changed
 		theDIPackage.freeze();
 
+  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(DIPackage.eNS_URI, theDIPackage);
 		return theDIPackage;
@@ -145,7 +135,6 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getDiagramElement() {
@@ -154,57 +143,66 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getDiagramElement_ModelElement() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures()
-				.get(0);
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getDiagramElement_OwningElement() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures()
-				.get(1);
+	public EReference getDiagramElement_OwningDiagramElement() {
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getDiagramElement_OwnedElement() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures()
-				.get(2);
+	public EReference getDiagramElement_OwnedDiagramElement() {
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getDiagramElement_LocalStyle() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures()
-				.get(3);
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(3);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getDiagramElement_SharedStyle() {
-		return (EReference) diagramElementEClass.getEStructuralFeatures()
-				.get(4);
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDiagramElement_TargetEdge() {
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getDiagramElement_SourceEdge() {
+		return (EReference)diagramElementEClass.getEStructuralFeatures().get(6);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getStyle() {
@@ -213,7 +211,6 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getEdge() {
@@ -221,35 +218,33 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getEdge_Source() {
-		return (EReference) edgeEClass.getEStructuralFeatures().get(0);
+	public EReference getEdge_SourceDiagramElement() {
+		return (EReference)edgeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
-	public EReference getEdge_Target() {
-		return (EReference) edgeEClass.getEStructuralFeatures().get(1);
+	public EReference getEdge_Waypoint() {
+		return (EReference)edgeEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EReference getEdge_Waypoint() {
-		return (EReference) edgeEClass.getEStructuralFeatures().get(2);
+	public EReference getEdge_TargetDiagramElement() {
+		return (EReference)edgeEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getDiagram() {
@@ -258,34 +253,30 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getDiagram_Name() {
-		return (EAttribute) diagramEClass.getEStructuralFeatures().get(0);
+		return (EAttribute)diagramEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getDiagram_Documentation() {
-		return (EAttribute) diagramEClass.getEStructuralFeatures().get(1);
+		return (EAttribute)diagramEClass.getEStructuralFeatures().get(1);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EAttribute getDiagram_Resolution() {
-		return (EAttribute) diagramEClass.getEStructuralFeatures().get(2);
+		return (EAttribute)diagramEClass.getEStructuralFeatures().get(2);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EClass getShape() {
@@ -294,55 +285,53 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EReference getShape_Bounds() {
-		return (EReference) shapeEClass.getEStructuralFeatures().get(0);
+		return (EReference)shapeEClass.getEStructuralFeatures().get(0);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DIFactory getDIFactory() {
-		return (DIFactory) getEFactoryInstance();
+		return (DIFactory)getEFactoryInstance();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package. This method is guarded to
-	 * have no affect on any invocation but its first. <!-- begin-user-doc -->
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated)
-			return;
+		if (isCreated) return;
 		isCreated = true;
 
 		// Create classes and their features
 		diagramElementEClass = createEClass(DIAGRAM_ELEMENT);
 		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__MODEL_ELEMENT);
-		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__OWNING_ELEMENT);
-		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__OWNED_ELEMENT);
+		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
+		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
 		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__LOCAL_STYLE);
 		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__SHARED_STYLE);
+		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__TARGET_EDGE);
+		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__SOURCE_EDGE);
 
 		styleEClass = createEClass(STYLE);
 
 		edgeEClass = createEClass(EDGE);
-		createEReference(edgeEClass, EDGE__SOURCE);
-		createEReference(edgeEClass, EDGE__TARGET);
+		createEReference(edgeEClass, EDGE__SOURCE_DIAGRAM_ELEMENT);
 		createEReference(edgeEClass, EDGE__WAYPOINT);
+		createEReference(edgeEClass, EDGE__TARGET_DIAGRAM_ELEMENT);
 
 		diagramEClass = createEClass(DIAGRAM);
 		createEAttribute(diagramEClass, DIAGRAM__NAME);
@@ -355,7 +344,6 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -368,8 +356,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized)
-			return;
+		if (isInitialized) return;
 		isInitialized = true;
 
 		// Initialize package
@@ -378,10 +365,8 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		EcorePackage theEcorePackage = (EcorePackage) EPackage.Registry.INSTANCE
-				.getEPackage(EcorePackage.eNS_URI);
-		DCPackage theDCPackage = (DCPackage) EPackage.Registry.INSTANCE
-				.getEPackage(DCPackage.eNS_URI);
+		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
+		DCPackage theDCPackage = (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
 
 		// Create type parameters
 
@@ -393,74 +378,29 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 		shapeEClass.getESuperTypes().add(this.getDiagramElement());
 
 		// Initialize classes, features, and operations; add parameters
-		initEClass(diagramElementEClass, DiagramElement.class,
-				"DiagramElement", IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDiagramElement_ModelElement(),
-				theEcorePackage.getEObject(), null, "modelElement", null, 0, 1,
-				DiagramElement.class, IS_TRANSIENT, IS_VOLATILE,
-				!IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
-		initEReference(getDiagramElement_OwningElement(),
-				this.getDiagramElement(),
-				this.getDiagramElement_OwnedElement(), "owningElement", null,
-				0, 1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE,
-				!IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
-		initEReference(getDiagramElement_OwnedElement(),
-				this.getDiagramElement(),
-				this.getDiagramElement_OwningElement(), "ownedElement", null,
-				0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE,
-				!IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
-		initEReference(getDiagramElement_LocalStyle(), this.getStyle(), null,
-				"localStyle", null, 0, 1, DiagramElement.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-		initEReference(getDiagramElement_SharedStyle(), this.getStyle(), null,
-				"sharedStyle", null, 0, 1, DiagramElement.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
-		initEClass(styleEClass, Style.class, "Style", IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(edgeEClass, Edge.class, "Edge", IS_ABSTRACT, !IS_INTERFACE,
-				IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getEdge_Source(), this.getDiagramElement(), null,
-				"source", null, 1, 1, Edge.class, IS_TRANSIENT, IS_VOLATILE,
-				!IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
-		initEReference(getEdge_Target(), this.getDiagramElement(), null,
-				"target", null, 1, 1, Edge.class, IS_TRANSIENT, IS_VOLATILE,
-				!IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
-		initEReference(getEdge_Waypoint(), theDCPackage.getPoint(), null,
-				"waypoint", null, 0, -1, Edge.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(diagramEClass, Diagram.class, "Diagram", IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDiagram_Name(), theDCPackage.getString(), "name", "",
-				1, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				!IS_ORDERED);
-		initEAttribute(getDiagram_Documentation(), theDCPackage.getString(),
-				"documentation", "", 1, 1, Diagram.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-		initEAttribute(getDiagram_Resolution(), theDCPackage.getReal(),
-				"resolution", "300", 1, 1, Diagram.class, !IS_TRANSIENT,
-				!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, !IS_ORDERED);
-
-		initEClass(shapeEClass, Shape.class, "Shape", IS_ABSTRACT,
-				!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getShape_Bounds(), theDCPackage.getBounds(), null,
-				"bounds", null, 0, 1, Shape.class, !IS_TRANSIENT, !IS_VOLATILE,
-				IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEClass(diagramElementEClass, DiagramElement.class, "DiagramElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDiagramElement_ModelElement(), theEcorePackage.getEObject(), null, "modelElement", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEReference(getDiagramElement_OwningDiagramElement(), this.getDiagramElement(), this.getDiagramElement_OwnedDiagramElement(), "owningDiagramElement", null, 0, 1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
+		initEReference(getDiagramElement_OwnedDiagramElement(), this.getDiagramElement(), this.getDiagramElement_OwningDiagramElement(), "ownedDiagramElement", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEReference(getDiagramElement_LocalStyle(), this.getStyle(), null, "localStyle", null, 0, 1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
+		initEReference(getDiagramElement_SharedStyle(), this.getStyle(), null, "sharedStyle", null, 0, 1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
+		initEReference(getDiagramElement_TargetEdge(), this.getEdge(), this.getEdge_TargetDiagramElement(), "targetEdge", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEReference(getDiagramElement_SourceEdge(), this.getEdge(), this.getEdge_SourceDiagramElement(), "sourceEdge", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+		initEClass(styleEClass, Style.class, "Style", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(edgeEClass, Edge.class, "Edge", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getEdge_SourceDiagramElement(), this.getDiagramElement(), this.getDiagramElement_SourceEdge(), "sourceDiagramElement", null, 1, 1, Edge.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
+		initEReference(getEdge_Waypoint(), theDCPackage.getPoint(), null, "waypoint", null, 0, -1, Edge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getEdge_TargetDiagramElement(), this.getDiagramElement(), this.getDiagramElement_TargetEdge(), "targetDiagramElement", null, 1, 1, Edge.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
+
+		initEClass(diagramEClass, Diagram.class, "Diagram", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getDiagram_Name(), theDCPackage.getString(), "name", "", 1, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getDiagram_Documentation(), theDCPackage.getString(), "documentation", "", 1, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getDiagram_Resolution(), theDCPackage.getReal(), "resolution", "300", 1, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(shapeEClass, Shape.class, "Shape", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getShape_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 0, 1, Shape.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);
@@ -471,19 +411,58 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	}
 
 	/**
-	 * Initializes the annotations for <b>union</b>. <!-- begin-user-doc -->
+	 * Initializes the annotations for <b>union</b>.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected void createUnionAnnotations() {
-		String source = "union";
-		addAnnotation(getDiagramElement_ModelElement(), source, new String[] {});
-		addAnnotation(getDiagramElement_OwningElement(), source,
-				new String[] {});
-		addAnnotation(getDiagramElement_OwnedElement(), source, new String[] {});
-		addAnnotation(getEdge_Source(), source, new String[] {});
-		addAnnotation(getEdge_Target(), source, new String[] {});
+		String source = "union";					
+		addAnnotation
+		  (getDiagramElement_ModelElement(), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  (getDiagramElement_OwningDiagramElement(), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  (getDiagramElement_OwnedDiagramElement(), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  (getDiagramElement_LocalStyle(), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  (getDiagramElement_SharedStyle(), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  (getDiagramElement_TargetEdge(), 
+		   source, 
+		   new String[] {
+		   });			
+		addAnnotation
+		  (getDiagramElement_SourceEdge(), 
+		   source, 
+		   new String[] {
+		   });					
+		addAnnotation
+		  (getEdge_SourceDiagramElement(), 
+		   source, 
+		   new String[] {
+		   });				
+		addAnnotation
+		  (getEdge_TargetDiagramElement(), 
+		   source, 
+		   new String[] {
+		   });						
 	}
 
 } // DIPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java
index e6e2f804f33..c5a0a799d57 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java
@@ -11,22 +11,15 @@
  */
 package org.eclipse.papyrus.dd.di.impl;
 
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
 import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.DiagramElement;
+import org.eclipse.papyrus.dd.di.Edge;
 import org.eclipse.papyrus.dd.di.Style;
-
 import org.eclipse.uml2.common.util.DerivedUnionEObjectEList;
 
 /**
@@ -35,48 +28,23 @@ import org.eclipse.uml2.common.util.DerivedUnionEObjectEList;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getModelElement
- * <em>Model Element</em>}</li>
- * <li>
- * {@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getOwningElement
- * <em>Owning Element</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getOwnedElement
- * <em>Owned Element</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getLocalStyle
- * <em>Local Style</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getSharedStyle
- * <em>Shared Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getModelElement <em>Model Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getOwningDiagramElement <em>Owning Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getOwnedDiagramElement <em>Owned Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getLocalStyle <em>Local Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getSharedStyle <em>Shared Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getTargetEdge <em>Target Edge</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getSourceEdge <em>Source Edge</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 		implements DiagramElement {
 
 	/**
-	 * The cached value of the '{@link #getLocalStyle() <em>Local Style</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getLocalStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected Style localStyle;
-
-	/**
-	 * The cached value of the '{@link #getSharedStyle() <em>Shared Style</em>}'
-	 * reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @see #getSharedStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected Style sharedStyle;
-
-	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected DiagramElementImpl() {
@@ -85,7 +53,6 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -95,279 +62,206 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
-	public EObject getModelElement() {
-		EObject modelElement = basicGetModelElement();
-		return modelElement != null && modelElement.eIsProxy() ? eResolveProxy((InternalEObject) modelElement)
-				: modelElement;
+	public EList<EObject> getModelElement() {
+		return new DerivedUnionEObjectEList<EObject>(EObject.class, this, DIPackage.DIAGRAM_ELEMENT__MODEL_ELEMENT, null);
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EObject basicGetModelElement() {
-		return null;
+	public DiagramElement getOwningDiagramElement() {
+		DiagramElement owningDiagramElement = basicGetOwningDiagramElement();
+		return owningDiagramElement != null && owningDiagramElement.eIsProxy() ? (DiagramElement)eResolveProxy((InternalEObject)owningDiagramElement) : owningDiagramElement;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public DiagramElement getOwningElement() {
-		DiagramElement owningElement = basicGetOwningElement();
-		return owningElement != null && owningElement.eIsProxy() ? (DiagramElement) eResolveProxy((InternalEObject) owningElement)
-				: owningElement;
+	public DiagramElement basicGetOwningDiagramElement() {
+		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public DiagramElement basicGetOwningElement() {
-		return null;
+	public EList<DiagramElement> getOwnedDiagramElement() {
+		return new DerivedUnionEObjectEList<DiagramElement>(DiagramElement.class, this, DIPackage.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT, null);
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<DiagramElement> getOwnedElement() {
-		return new DerivedUnionEObjectEList<DiagramElement>(
-				DiagramElement.class, this,
-				DIPackage.DIAGRAM_ELEMENT__OWNED_ELEMENT, null);
+	public EList<Edge> getTargetEdge() {
+		return new DerivedUnionEObjectEList<Edge>(Edge.class, this, DIPackage.DIAGRAM_ELEMENT__TARGET_EDGE, null);
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public Style getLocalStyle() {
-		return localStyle;
+	public EList<Edge> getSourceEdge() {
+		return new DerivedUnionEObjectEList<Edge>(Edge.class, this, DIPackage.DIAGRAM_ELEMENT__SOURCE_EDGE, null);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetLocalStyle(Style newLocalStyle,
-			NotificationChain msgs) {
-		Style oldLocalStyle = localStyle;
-		localStyle = newLocalStyle;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE,
-					oldLocalStyle, newLocalStyle);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
+	public Style getLocalStyle() {
+		Style localStyle = basicGetLocalStyle();
+		return localStyle != null && localStyle.eIsProxy() ? (Style)eResolveProxy((InternalEObject)localStyle) : localStyle;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setLocalStyle(Style newLocalStyle) {
-		if (newLocalStyle != localStyle) {
-			NotificationChain msgs = null;
-			if (localStyle != null)
-				msgs = ((InternalEObject) localStyle).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE
-								- DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE, null,
-						msgs);
-			if (newLocalStyle != null)
-				msgs = ((InternalEObject) newLocalStyle).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE
-								- DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE, null,
-						msgs);
-			msgs = basicSetLocalStyle(newLocalStyle, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE, newLocalStyle,
-					newLocalStyle));
+	public Style basicGetLocalStyle() {
+		return null;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Style getSharedStyle() {
-		if (sharedStyle != null && sharedStyle.eIsProxy()) {
-			InternalEObject oldSharedStyle = (InternalEObject) sharedStyle;
-			sharedStyle = (Style) eResolveProxy(oldSharedStyle);
-			if (sharedStyle != oldSharedStyle) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-							DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE,
-							oldSharedStyle, sharedStyle));
-			}
-		}
-		return sharedStyle;
+		Style sharedStyle = basicGetSharedStyle();
+		return sharedStyle != null && sharedStyle.eIsProxy() ? (Style)eResolveProxy((InternalEObject)sharedStyle) : sharedStyle;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Style basicGetSharedStyle() {
-		return sharedStyle;
+		return null;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
-	public void setSharedStyle(Style newSharedStyle) {
-		Style oldSharedStyle = sharedStyle;
-		sharedStyle = newSharedStyle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE, oldSharedStyle,
-					sharedStyle));
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case DIPackage.DIAGRAM_ELEMENT__MODEL_ELEMENT:
+				return getModelElement();
+			case DIPackage.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT:
+				if (resolve) return getOwningDiagramElement();
+				return basicGetOwningDiagramElement();
+			case DIPackage.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT:
+				return getOwnedDiagramElement();
+			case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
+				if (resolve) return getLocalStyle();
+				return basicGetLocalStyle();
+			case DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE:
+				if (resolve) return getSharedStyle();
+				return basicGetSharedStyle();
+			case DIPackage.DIAGRAM_ELEMENT__TARGET_EDGE:
+				return getTargetEdge();
+			case DIPackage.DIAGRAM_ELEMENT__SOURCE_EDGE:
+				return getSourceEdge();
+		}
+		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
+	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
-			return basicSetLocalStyle(null, msgs);
+			case DIPackage.DIAGRAM_ELEMENT__MODEL_ELEMENT:
+				return isSetModelElement();
+			case DIPackage.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT:
+				return isSetOwningDiagramElement();
+			case DIPackage.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT:
+				return isSetOwnedDiagramElement();
+			case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
+				return isSetLocalStyle();
+			case DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE:
+				return isSetSharedStyle();
+			case DIPackage.DIAGRAM_ELEMENT__TARGET_EDGE:
+				return isSetTargetEdge();
+			case DIPackage.DIAGRAM_ELEMENT__SOURCE_EDGE:
+				return isSetSourceEdge();
 		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
+		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case DIPackage.DIAGRAM_ELEMENT__MODEL_ELEMENT:
-			if (resolve)
-				return getModelElement();
-			return basicGetModelElement();
-		case DIPackage.DIAGRAM_ELEMENT__OWNING_ELEMENT:
-			if (resolve)
-				return getOwningElement();
-			return basicGetOwningElement();
-		case DIPackage.DIAGRAM_ELEMENT__OWNED_ELEMENT:
-			return getOwnedElement();
-		case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
-			return getLocalStyle();
-		case DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE:
-			if (resolve)
-				return getSharedStyle();
-			return basicGetSharedStyle();
-		}
-		return super.eGet(featureID, resolve, coreType);
+	public boolean isSetModelElement() {
+		return false;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
-			setLocalStyle((Style) newValue);
-			return;
-		case DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE:
-			setSharedStyle((Style) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
+	public boolean isSetOwningDiagramElement() {
+		return false;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
-			setLocalStyle((Style) null);
-			return;
-		case DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE:
-			setSharedStyle((Style) null);
-			return;
-		}
-		super.eUnset(featureID);
+	public boolean isSetOwnedDiagramElement() {
+		return false;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case DIPackage.DIAGRAM_ELEMENT__MODEL_ELEMENT:
-			return isSetModelElement();
-		case DIPackage.DIAGRAM_ELEMENT__OWNING_ELEMENT:
-			return isSetOwningElement();
-		case DIPackage.DIAGRAM_ELEMENT__OWNED_ELEMENT:
-			return isSetOwnedElement();
-		case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
-			return localStyle != null;
-		case DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE:
-			return sharedStyle != null;
-		}
-		return super.eIsSet(featureID);
+	public boolean isSetLocalStyle() {
+		return false;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean isSetModelElement() {
+	public boolean isSetSharedStyle() {
 		return false;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean isSetOwningElement() {
+	public boolean isSetTargetEdge() {
 		return false;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean isSetOwnedElement() {
+	public boolean isSetSourceEdge() {
 		return false;
 	}
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java
index 1dba0ed50c5..9660868647f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java
@@ -26,14 +26,12 @@ import org.eclipse.papyrus.dd.di.Diagram;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl#getDocumentation <em>
- * Documentation</em>}</li>
- * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl#getResolution <em>
- * Resolution</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl#getDocumentation <em>Documentation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl#getResolution <em>Resolution</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class DiagramImpl extends ShapeImpl implements Diagram {
@@ -41,7 +39,6 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -51,7 +48,6 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	/**
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -59,10 +55,9 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	protected String name = NAME_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getDocumentation()
-	 * <em>Documentation</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getDocumentation()
 	 * @generated
 	 * @ordered
@@ -70,10 +65,9 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	protected static final String DOCUMENTATION_EDEFAULT = "";
 
 	/**
-	 * The cached value of the '{@link #getDocumentation()
-	 * <em>Documentation</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getDocumentation()
 	 * @generated
 	 * @ordered
@@ -81,9 +75,8 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	protected String documentation = DOCUMENTATION_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getResolution() <em>Resolution</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The default value of the '{@link #getResolution() <em>Resolution</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getResolution()
 	 * @generated
 	 * @ordered
@@ -91,9 +84,8 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	protected static final double RESOLUTION_EDEFAULT = 300.0;
 
 	/**
-	 * The cached value of the '{@link #getResolution() <em>Resolution</em>}'
-	 * attribute. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getResolution() <em>Resolution</em>}' attribute.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getResolution()
 	 * @generated
 	 * @ordered
@@ -102,7 +94,6 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected DiagramImpl() {
@@ -111,7 +102,6 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -121,7 +111,6 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -130,20 +119,17 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 
 	/**
 	 * <!-- 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,
-					DIPackage.DIAGRAM__NAME, oldName, name));
+			eNotify(new ENotificationImpl(this, Notification.SET, DIPackage.DIAGRAM__NAME, oldName, name));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public String getDocumentation() {
@@ -152,21 +138,17 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setDocumentation(String newDocumentation) {
 		String oldDocumentation = documentation;
 		documentation = newDocumentation;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DIPackage.DIAGRAM__DOCUMENTATION, oldDocumentation,
-					documentation));
+			eNotify(new ENotificationImpl(this, Notification.SET, DIPackage.DIAGRAM__DOCUMENTATION, oldDocumentation, documentation));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public double getResolution() {
@@ -175,106 +157,96 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setResolution(double newResolution) {
 		double oldResolution = resolution;
 		resolution = newResolution;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DIPackage.DIAGRAM__RESOLUTION, oldResolution, resolution));
+			eNotify(new ENotificationImpl(this, Notification.SET, DIPackage.DIAGRAM__RESOLUTION, oldResolution, resolution));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DIPackage.DIAGRAM__NAME:
-			return getName();
-		case DIPackage.DIAGRAM__DOCUMENTATION:
-			return getDocumentation();
-		case DIPackage.DIAGRAM__RESOLUTION:
-			return getResolution();
+			case DIPackage.DIAGRAM__NAME:
+				return getName();
+			case DIPackage.DIAGRAM__DOCUMENTATION:
+				return getDocumentation();
+			case DIPackage.DIAGRAM__RESOLUTION:
+				return getResolution();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DIPackage.DIAGRAM__NAME:
-			setName((String) newValue);
-			return;
-		case DIPackage.DIAGRAM__DOCUMENTATION:
-			setDocumentation((String) newValue);
-			return;
-		case DIPackage.DIAGRAM__RESOLUTION:
-			setResolution((Double) newValue);
-			return;
+			case DIPackage.DIAGRAM__NAME:
+				setName((String)newValue);
+				return;
+			case DIPackage.DIAGRAM__DOCUMENTATION:
+				setDocumentation((String)newValue);
+				return;
+			case DIPackage.DIAGRAM__RESOLUTION:
+				setResolution((Double)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DIPackage.DIAGRAM__NAME:
-			setName(NAME_EDEFAULT);
-			return;
-		case DIPackage.DIAGRAM__DOCUMENTATION:
-			setDocumentation(DOCUMENTATION_EDEFAULT);
-			return;
-		case DIPackage.DIAGRAM__RESOLUTION:
-			setResolution(RESOLUTION_EDEFAULT);
-			return;
+			case DIPackage.DIAGRAM__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case DIPackage.DIAGRAM__DOCUMENTATION:
+				setDocumentation(DOCUMENTATION_EDEFAULT);
+				return;
+			case DIPackage.DIAGRAM__RESOLUTION:
+				setResolution(RESOLUTION_EDEFAULT);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DIPackage.DIAGRAM__NAME:
-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT
-					.equals(name);
-		case DIPackage.DIAGRAM__DOCUMENTATION:
-			return DOCUMENTATION_EDEFAULT == null ? documentation != null
-					: !DOCUMENTATION_EDEFAULT.equals(documentation);
-		case DIPackage.DIAGRAM__RESOLUTION:
-			return resolution != RESOLUTION_EDEFAULT;
+			case DIPackage.DIAGRAM__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case DIPackage.DIAGRAM__DOCUMENTATION:
+				return DOCUMENTATION_EDEFAULT == null ? documentation != null : !DOCUMENTATION_EDEFAULT.equals(documentation);
+			case DIPackage.DIAGRAM__RESOLUTION:
+				return resolution != RESOLUTION_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy())
-			return super.toString();
+		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java
index 31f9e1fdbae..569b1bdc2ed 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java
@@ -12,19 +12,13 @@
 package org.eclipse.papyrus.dd.di.impl;
 
 import java.util.Collection;
-
 import org.eclipse.emf.common.notify.NotificationChain;
-
 import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
-
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.InternalEList;
-
 import org.eclipse.papyrus.dd.dc.Point;
-
 import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.DiagramElement;
 import org.eclipse.papyrus.dd.di.Edge;
@@ -35,23 +29,19 @@ import org.eclipse.papyrus.dd.di.Edge;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl#getSource <em>Source</em>}
- * </li>
- * <li>{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl#getTarget <em>Target</em>}
- * </li>
- * <li>{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl#getWaypoint <em>Waypoint
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl#getSourceDiagramElement <em>Source Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl#getTargetDiagramElement <em>Target Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl#getWaypoint <em>Waypoint</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 
 	/**
-	 * The cached value of the '{@link #getWaypoint() <em>Waypoint</em>}'
-	 * containment reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getWaypoint() <em>Waypoint</em>}' containment reference list.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getWaypoint()
 	 * @generated
 	 * @ordered
@@ -60,7 +50,6 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected EdgeImpl() {
@@ -69,7 +58,6 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -78,161 +66,149 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public DiagramElement getSource() {
-		DiagramElement source = basicGetSource();
-		return source != null && source.eIsProxy() ? (DiagramElement) eResolveProxy((InternalEObject) source)
-				: source;
+	public DiagramElement getSourceDiagramElement() {
+		DiagramElement sourceDiagramElement = basicGetSourceDiagramElement();
+		return sourceDiagramElement != null && sourceDiagramElement.eIsProxy() ? (DiagramElement)eResolveProxy((InternalEObject)sourceDiagramElement) : sourceDiagramElement;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public DiagramElement basicGetSource() {
+	public DiagramElement basicGetSourceDiagramElement() {
 		return null;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public DiagramElement getTarget() {
-		DiagramElement target = basicGetTarget();
-		return target != null && target.eIsProxy() ? (DiagramElement) eResolveProxy((InternalEObject) target)
-				: target;
+	public DiagramElement getTargetDiagramElement() {
+		DiagramElement targetDiagramElement = basicGetTargetDiagramElement();
+		return targetDiagramElement != null && targetDiagramElement.eIsProxy() ? (DiagramElement)eResolveProxy((InternalEObject)targetDiagramElement) : targetDiagramElement;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public DiagramElement basicGetTarget() {
+	public DiagramElement basicGetTargetDiagramElement() {
 		return null;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<Point> getWaypoint() {
 		if (waypoint == null) {
-			waypoint = new EObjectContainmentEList<Point>(Point.class, this,
-					DIPackage.EDGE__WAYPOINT);
+			waypoint = new EObjectContainmentEList<Point>(Point.class, this, DIPackage.EDGE__WAYPOINT);
 		}
 		return waypoint;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DIPackage.EDGE__WAYPOINT:
-			return ((InternalEList<?>) getWaypoint()).basicRemove(otherEnd,
-					msgs);
+			case DIPackage.EDGE__WAYPOINT:
+				return ((InternalEList<?>)getWaypoint()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DIPackage.EDGE__SOURCE:
-			if (resolve)
-				return getSource();
-			return basicGetSource();
-		case DIPackage.EDGE__TARGET:
-			if (resolve)
-				return getTarget();
-			return basicGetTarget();
-		case DIPackage.EDGE__WAYPOINT:
-			return getWaypoint();
+			case DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT:
+				if (resolve) return getSourceDiagramElement();
+				return basicGetSourceDiagramElement();
+			case DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT:
+				if (resolve) return getTargetDiagramElement();
+				return basicGetTargetDiagramElement();
+			case DIPackage.EDGE__WAYPOINT:
+				return getWaypoint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DIPackage.EDGE__WAYPOINT:
-			getWaypoint().clear();
-			getWaypoint().addAll((Collection<? extends Point>) newValue);
-			return;
+			case DIPackage.EDGE__WAYPOINT:
+				getWaypoint().clear();
+				getWaypoint().addAll((Collection<? extends Point>)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DIPackage.EDGE__WAYPOINT:
-			getWaypoint().clear();
-			return;
+			case DIPackage.EDGE__WAYPOINT:
+				getWaypoint().clear();
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DIPackage.EDGE__SOURCE:
-			return isSetSource();
-		case DIPackage.EDGE__TARGET:
-			return isSetTarget();
-		case DIPackage.EDGE__WAYPOINT:
-			return waypoint != null && !waypoint.isEmpty();
+			case DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT:
+				return isSetSourceDiagramElement();
+			case DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT:
+				return isSetTargetDiagramElement();
+			case DIPackage.EDGE__WAYPOINT:
+				return waypoint != null && !waypoint.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean isSetSource() {
+	public boolean isSetSourceDiagramElement() {
 		return false;
 	}
 
 	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean isSetTarget() {
+	public boolean isSetTargetDiagramElement() {
 		return false;
 	}
 
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java
index 9c4874c3379..bfa1d26e1ba 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java
@@ -30,19 +30,17 @@ import org.eclipse.papyrus.dd.di.Shape;
  * <p>
  * The following features are implemented:
  * <ul>
- * <li>{@link org.eclipse.papyrus.dd.di.impl.ShapeImpl#getBounds <em>Bounds
- * </em>}</li>
+ *   <li>{@link org.eclipse.papyrus.dd.di.impl.ShapeImpl#getBounds <em>Bounds</em>}</li>
  * </ul>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 
 	/**
-	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}'
-	 * containment reference. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -51,7 +49,6 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected ShapeImpl() {
@@ -60,7 +57,6 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -70,7 +66,6 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -79,7 +74,6 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBounds(Bounds newBounds,
@@ -87,110 +81,94 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
 		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this,
-					Notification.SET, DIPackage.SHAPE__BOUNDS, oldBounds,
-					newBounds);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DIPackage.SHAPE__BOUNDS, oldBounds, newBounds);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
 		if (newBounds != bounds) {
 			NotificationChain msgs = null;
 			if (bounds != null)
-				msgs = ((InternalEObject) bounds).eInverseRemove(this,
-						EOPPOSITE_FEATURE_BASE - DIPackage.SHAPE__BOUNDS, null,
-						msgs);
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DIPackage.SHAPE__BOUNDS, null, msgs);
 			if (newBounds != null)
-				msgs = ((InternalEObject) newBounds).eInverseAdd(this,
-						EOPPOSITE_FEATURE_BASE - DIPackage.SHAPE__BOUNDS, null,
-						msgs);
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DIPackage.SHAPE__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET,
-					DIPackage.SHAPE__BOUNDS, newBounds, newBounds));
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, DIPackage.SHAPE__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd,
 			int featureID, NotificationChain msgs) {
 		switch (featureID) {
-		case DIPackage.SHAPE__BOUNDS:
-			return basicSetBounds(null, msgs);
+			case DIPackage.SHAPE__BOUNDS:
+				return basicSetBounds(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-		case DIPackage.SHAPE__BOUNDS:
-			return getBounds();
+			case DIPackage.SHAPE__BOUNDS:
+				return getBounds();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-		case DIPackage.SHAPE__BOUNDS:
-			setBounds((Bounds) newValue);
-			return;
+			case DIPackage.SHAPE__BOUNDS:
+				setBounds((Bounds)newValue);
+				return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-		case DIPackage.SHAPE__BOUNDS:
-			setBounds((Bounds) null);
-			return;
+			case DIPackage.SHAPE__BOUNDS:
+				setBounds((Bounds)null);
+				return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-		case DIPackage.SHAPE__BOUNDS:
-			return bounds != null;
+			case DIPackage.SHAPE__BOUNDS:
+				return bounds != null;
 		}
 		return super.eIsSet(featureID);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java
index 6c537dde9f8..dbd1caa2d7d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java
@@ -23,7 +23,7 @@ import org.eclipse.papyrus.dd.di.Style;
  * <em><b>Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- * 
+ *
  * @generated
  */
 public abstract class StyleImpl extends MinimalEObjectImpl.Container implements
@@ -31,7 +31,6 @@ public abstract class StyleImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected StyleImpl() {
@@ -40,7 +39,6 @@ public abstract class StyleImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java
index c7e774f81fe..6a8c2ae0756 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java
@@ -24,23 +24,22 @@ import org.eclipse.papyrus.dd.di.*;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
  * an adapter <code>createXXX</code> method for each class of the model. <!--
  * end-user-doc -->
- * 
  * @see org.eclipse.papyrus.dd.di.DIPackage
  * @generated
  */
 public class DIAdapterFactory extends AdapterFactoryImpl {
 
 	/**
-	 * The cached model package. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached model package.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected static DIPackage modelPackage;
 
 	/**
-	 * Creates an instance of the adapter factory. <!-- begin-user-doc --> <!--
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DIAdapterFactory() {
@@ -54,7 +53,6 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if
 	 * the object is either the model's package or is an instance object of the
 	 * model. <!-- end-user-doc -->
-	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -64,7 +62,7 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 			return true;
 		}
 		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
 	}
@@ -76,59 +74,50 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	 * @generated
 	 */
 	protected DISwitch<Adapter> modelSwitch = new DISwitch<Adapter>() {
-
-		@Override
-		public Adapter caseDiagramElement(DiagramElement object) {
-			return createDiagramElementAdapter();
-		}
-
-		@Override
-		public Adapter caseStyle(Style object) {
-			return createStyleAdapter();
-		}
-
-		@Override
-		public Adapter caseEdge(Edge object) {
-			return createEdgeAdapter();
-		}
-
-		@Override
-		public Adapter caseDiagram(Diagram object) {
-			return createDiagramAdapter();
-		}
-
-		@Override
-		public Adapter caseShape(Shape object) {
-			return createShapeAdapter();
-		}
-
-		@Override
-		public Adapter defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
+			@Override
+			public Adapter caseDiagramElement(DiagramElement object) {
+				return createDiagramElementAdapter();
+			}
+			@Override
+			public Adapter caseStyle(Style object) {
+				return createStyleAdapter();
+			}
+			@Override
+			public Adapter caseEdge(Edge object) {
+				return createEdgeAdapter();
+			}
+			@Override
+			public Adapter caseDiagram(Diagram object) {
+				return createDiagramAdapter();
+			}
+			@Override
+			public Adapter caseShape(Shape object) {
+				return createShapeAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
 
 	/**
-	 * Creates an adapter for the <code>target</code>. <!-- begin-user-doc -->
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
-	 * @param target
-	 *            the object to adapt.
+	 * @param target the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
 	@Override
 	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
+		return modelSwitch.doSwitch((EObject)target);
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.di.DiagramElement <em>Diagram Element</em>}
-	 * '. <!-- begin-user-doc --> This default implementation returns null so
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.di.DiagramElement <em>Diagram Element</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.dd.di.DiagramElement
 	 * @generated
@@ -198,9 +187,9 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for the default case. <!-- begin-user-doc --> This
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc --> This
 	 * default implementation returns null. <!-- end-user-doc -->
-	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java
new file mode 100644
index 00000000000..3f108322941
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java
@@ -0,0 +1,146 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.dd.di.util;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.papyrus.dd.di.DIPackage;
+import org.eclipse.papyrus.dd.di.Diagram;
+import org.eclipse.papyrus.dd.di.Edge;
+import org.eclipse.papyrus.dd.di.Shape;
+
+/**
+ * <!-- begin-user-doc -->
+ * An adapter that propagates notifications for derived unions.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.dd.di.DIPackage
+ * @generated
+ */
+public class DIDerivedUnionAdapter extends AdapterImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static DIPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DIDerivedUnionAdapter() {
+		if (modelPackage == null) {
+			modelPackage = DIPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Calls <code>notifyChanged</code> with the appropriate model class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		Object notifier = notification.getNotifier();
+		if (notifier instanceof EObject) {
+			EClass eClass = ((EObject)notifier).eClass();
+			if (eClass.eContainer() == modelPackage) {
+				notifyChanged(notification, eClass);
+			}
+		}
+	}
+
+	/**
+	 * Calls <code>notifyXXXChanged</code> for the corresponding class of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @param eClass the Ecore class of the notifier.
+	 * @generated
+	 */
+	protected void notifyChanged(Notification notification, EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case DIPackage.EDGE:
+				notifyEdgeChanged(notification, eClass);
+				break;
+			case DIPackage.DIAGRAM:
+				notifyDiagramChanged(notification, eClass);
+				break;
+			case DIPackage.SHAPE:
+				notifyShapeChanged(notification, eClass);
+				break;
+		}
+	}
+
+	/**
+	 * Does nothing; clients may override so that it does something.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @param eClass the Ecore class of the notifier.
+	 * @param derivedUnion the derived union affected by the change.
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification, EClass eClass, EStructuralFeature derivedUnion) {
+		// Do nothing.
+	}
+
+	/**
+	 * Calls <code>notifyChanged</code> for each affected derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @param eClass the Ecore class of the notifier.
+	 * @generated
+	 */
+	protected void notifyEdgeChanged(Notification notification, EClass eClass) {
+		switch (notification.getFeatureID(Edge.class)) {
+		}
+	}
+
+	/**
+	 * Calls <code>notifyChanged</code> for each affected derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @param eClass the Ecore class of the notifier.
+	 * @generated
+	 */
+	protected void notifyDiagramChanged(Notification notification, EClass eClass) {
+		switch (notification.getFeatureID(Diagram.class)) {
+		}
+	}
+
+	/**
+	 * Calls <code>notifyChanged</code> for each affected derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @param eClass the Ecore class of the notifier.
+	 * @generated
+	 */
+	protected void notifyShapeChanged(Notification notification, EClass eClass) {
+		switch (notification.getFeatureID(Shape.class)) {
+		}
+	}
+
+} //DIDerivedUnionAdapter
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java
index 031d2bc919b..8f2e5e9f4f9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java
@@ -25,23 +25,22 @@ import org.eclipse.papyrus.dd.di.*;
  * starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the
  * result of the switch. <!-- end-user-doc -->
- * 
  * @see org.eclipse.papyrus.dd.di.DIPackage
  * @generated
  */
 public class DISwitch<T> extends Switch<T> {
 
 	/**
-	 * The cached model package <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * The cached model package
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	protected static DIPackage modelPackage;
 
 	/**
-	 * Creates an instance of the switch. <!-- begin-user-doc --> <!--
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public DISwitch() {
@@ -64,75 +63,60 @@ public class DISwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns
-	 * a non null result; it yields that result. <!-- begin-user-doc --> <!--
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
-	 * @return the first non-null result returned by a <code>caseXXX</code>
-	 *         call.
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
-		case DIPackage.DIAGRAM_ELEMENT: {
-			DiagramElement diagramElement = (DiagramElement) theEObject;
-			T result = caseDiagramElement(diagramElement);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DIPackage.STYLE: {
-			Style style = (Style) theEObject;
-			T result = caseStyle(style);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DIPackage.EDGE: {
-			Edge edge = (Edge) theEObject;
-			T result = caseEdge(edge);
-			if (result == null)
-				result = caseDiagramElement(edge);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DIPackage.DIAGRAM: {
-			Diagram diagram = (Diagram) theEObject;
-			T result = caseDiagram(diagram);
-			if (result == null)
-				result = caseShape(diagram);
-			if (result == null)
-				result = caseDiagramElement(diagram);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case DIPackage.SHAPE: {
-			Shape shape = (Shape) theEObject;
-			T result = caseShape(shape);
-			if (result == null)
-				result = caseDiagramElement(shape);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
+			case DIPackage.DIAGRAM_ELEMENT: {
+				DiagramElement diagramElement = (DiagramElement)theEObject;
+				T result = caseDiagramElement(diagramElement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DIPackage.STYLE: {
+				Style style = (Style)theEObject;
+				T result = caseStyle(style);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DIPackage.EDGE: {
+				Edge edge = (Edge)theEObject;
+				T result = caseEdge(edge);
+				if (result == null) result = caseDiagramElement(edge);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DIPackage.DIAGRAM: {
+				Diagram diagram = (Diagram)theEObject;
+				T result = caseDiagram(diagram);
+				if (result == null) result = caseShape(diagram);
+				if (result == null) result = caseDiagramElement(diagram);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case DIPackage.SHAPE: {
+				Shape shape = (Shape)theEObject;
+				T result = caseShape(shape);
+				if (result == null) result = caseDiagramElement(shape);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
 		}
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Diagram Element</em>'. <!-- begin-user-doc --> This implementation
+	 * Returns the result of interpreting the object as an instance of '<em>Diagram Element</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>Diagram Element</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Diagram Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -141,15 +125,12 @@ public class DISwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Style</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Style</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>Style</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -175,15 +156,12 @@ public class DISwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Diagram</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Diagram</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>Diagram</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Diagram</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -192,15 +170,12 @@ public class DISwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Shape</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>Shape</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>Shape</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Shape</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -209,15 +184,12 @@ public class DISwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>EObject</em>'. <!-- begin-user-doc --> This implementation returns
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch, but this is
 	 * the last case anyway. <!-- end-user-doc -->
-	 * 
-	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '
-	 *         <em>EObject</em>'.
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
 	 */
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.classpath b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.classpath
new file mode 100644
index 00000000000..3bc247511f0
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.project b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.project
new file mode 100644
index 00000000000..8d0568ad665
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.umldi.edit</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..a944f0f686e
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.umldi.edit;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.umldi.provider.UMLDIEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.umldi.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.papyrus.umldi;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport,
+ org.eclipse.papyrus.dd;visibility:=reexport,
+ org.eclipse.papyrus.dd.edit;visibility:=reexport,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.uml2.types;visibility:=reexport,
+ org.eclipse.uml2.uml;visibility:=reexport,
+ org.eclipse.uml2.uml.edit;visibility:=reexport,
+ org.eclipse.uml2.common.edit;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/build.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/build.properties
new file mode 100644
index 00000000000..e3e904af755
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/build.properties
@@ -0,0 +1,18 @@
+# Copyright (c) 2014 CEA LIST.
+#  
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#  
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_localUmlStyle_UmlStyle.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_localUmlStyle_UmlStyle.gif
new file mode 100644
index 00000000000..589f7797165
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_localUmlStyle_UmlStyle.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlCompartment.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlCompartment.gif
new file mode 100644
index 00000000000..1010ed82e50
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlCompartment.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlDiagram.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlDiagram.gif
new file mode 100644
index 00000000000..eec2bf2352f
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlDiagram.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlEdge.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlEdge.gif
new file mode 100644
index 00000000000..bc6a13b92c7
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlEdge.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlLabel.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlLabel.gif
new file mode 100644
index 00000000000..500a9af5802
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlLabel.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlShape.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlShape.gif
new file mode 100644
index 00000000000..05e906c49dc
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/ctool16/CreateUmlDiagramElement_ownedUmlDiagramElement_UmlShape.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlCompartment.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlCompartment.gif
new file mode 100644
index 00000000000..35ef84e20e2
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlCompartment.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlDiagram.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlDiagram.gif
new file mode 100644
index 00000000000..b3643da048a
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlDiagram.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlEdge.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlEdge.gif
new file mode 100644
index 00000000000..94c953e013b
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlEdge.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlLabel.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlLabel.gif
new file mode 100644
index 00000000000..a17dc7d88e9
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlLabel.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlShape.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlShape.gif
new file mode 100644
index 00000000000..c8d381f0b32
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlShape.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlStyle.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlStyle.gif
new file mode 100644
index 00000000000..89ad5da38ab
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/icons/full/obj16/UmlStyle.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/plugin.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/plugin.properties
new file mode 100644
index 00000000000..902999c8b1c
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/plugin.properties
@@ -0,0 +1,51 @@
+# Copyright (c) 2014 CEA LIST.
+#  
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#  
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+pluginName = UMLDI Edit Support
+providerName = www.example.org
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} | {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_UmlDiagram_type = Uml Diagram
+_UI_UmlShape_type = Uml Shape
+_UI_UmlDiagramElement_type = Uml Diagram Element
+_UI_UmlStyle_type = Uml Style
+_UI_UmlEdge_type = Uml Edge
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_UmlDiagramElement_umlModelElement_feature = Uml Model Element
+_UI_UmlDiagramElement_sharedUmlStyle_feature = Shared Uml Style
+_UI_UmlDiagramElement_localUmlStyle_feature = Local Uml Style
+_UI_UmlDiagramElement_owningUmlDiagramElement_feature = Owning Uml Diagram Element
+_UI_UmlDiagramElement_ownedUmlDiagramElement_feature = Owned Uml Diagram Element
+_UI_UmlDiagramElement_targetUmlEdge_feature = Target Uml Edge
+_UI_UmlDiagramElement_sourceUmlEdge_feature = Source Uml Edge
+_UI_UmlStyle_fontName_feature = Font Name
+_UI_UmlStyle_fontSize_feature = Font Size
+_UI_UmlEdge_sourceUmlDiagramElement_feature = Source Uml Diagram Element
+_UI_UmlEdge_targetUmlDiagramElement_feature = Target Uml Diagram Element
+_UI_Unknown_feature = Unspecified
+
+_UI_UmlCompartment_type = Uml Compartment
+_UI_UmlLabel_type = Uml Label
+_UI_UmlCompartment_kind_feature = Kind
+_UI_UmlLabel_kind_feature = Kind
+_UI_UmlCompartmentKind_attributes_literal = attributes
+_UI_UmlCompartmentKind_operations_literal = operations
+_UI_UmlLabelKind_name_literal = name
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/plugin.xml b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/plugin.xml
new file mode 100644
index 00000000000..4c87088fc4a
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/plugin.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2014 CEA LIST.
+  
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+  
+ Contributors:
+  CEA LIST - Initial API and implementation
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated UMLDI -->
+      <factory
+            uri="http://www.omg.org/spec/UML/20131001/UMLDI"
+            class="org.eclipse.papyrus.umldi.provider.UMLDIItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource
+               org.eclipse.emf.edit.provider.IItemColorProvider
+               org.eclipse.emf.edit.provider.IItemFontProvider"/>
+   </extension>
+
+</plugin>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java
new file mode 100644
index 00000000000..c268714ae9f
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.provider;
+
+import org.eclipse.emf.common.EMFPlugin;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+
+import org.eclipse.papyrus.dd.edit.DDEditPlugin;
+
+import org.eclipse.uml2.uml.edit.UMLEditPlugin;
+
+/**
+ * This is the central singleton for the UMLDI edit plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class UMLDIEditPlugin extends EMFPlugin {
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final UMLDIEditPlugin INSTANCE = new UMLDIEditPlugin();
+
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDIEditPlugin() {
+		super
+		  (new ResourceLocator [] {
+		     DDEditPlugin.INSTANCE,
+		     EcoreEditPlugin.INSTANCE,
+		     UMLEditPlugin.INSTANCE,
+		   });
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class Implementation extends EclipsePlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+	}
+
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java
new file mode 100644
index 00000000000..58d359579e1
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java
@@ -0,0 +1,332 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.provider;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.edit.provider.ChangeNotifier;
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.IChangeNotifier;
+import org.eclipse.emf.edit.provider.IDisposable;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.INotifyChangedListener;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+
+import org.eclipse.papyrus.umldi.util.UMLDIAdapterFactory;
+
+/**
+ * This is the factory that is used to provide the interfaces needed to support Viewers.
+ * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
+ * The adapters also support Eclipse property sheets.
+ * Note that most of the adapters are shared among multiple instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+	/**
+	 * This keeps track of the root adapter factory that delegates to this adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ComposedAdapterFactory parentAdapterFactory;
+
+	/**
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IChangeNotifier changeNotifier = new ChangeNotifier();
+
+	/**
+	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
+
+	/**
+	 * This constructs an instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDIItemProviderAdapterFactory() {
+		supportedTypes.add(IEditingDomainItemProvider.class);
+		supportedTypes.add(IStructuredItemContentProvider.class);
+		supportedTypes.add(ITreeItemContentProvider.class);
+		supportedTypes.add(IItemLabelProvider.class);
+		supportedTypes.add(IItemPropertySource.class);
+		supportedTypes.add(IItemColorProvider.class);
+		supportedTypes.add(IItemFontProvider.class);
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlDiagram} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlDiagramItemProvider umlDiagramItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlDiagram}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createUmlDiagramAdapter() {
+		if (umlDiagramItemProvider == null) {
+			umlDiagramItemProvider = new UmlDiagramItemProvider(this);
+		}
+
+		return umlDiagramItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlShape} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlShapeItemProvider umlShapeItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlShape}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createUmlShapeAdapter() {
+		if (umlShapeItemProvider == null) {
+			umlShapeItemProvider = new UmlShapeItemProvider(this);
+		}
+
+		return umlShapeItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlStyle} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlStyleItemProvider umlStyleItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlStyle}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createUmlStyleAdapter() {
+		if (umlStyleItemProvider == null) {
+			umlStyleItemProvider = new UmlStyleItemProvider(this);
+		}
+
+		return umlStyleItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlEdge} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlEdgeItemProvider umlEdgeItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlEdge}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createUmlEdgeAdapter() {
+		if (umlEdgeItemProvider == null) {
+			umlEdgeItemProvider = new UmlEdgeItemProvider(this);
+		}
+
+		return umlEdgeItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlCompartment} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlCompartmentItemProvider umlCompartmentItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlCompartment}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createUmlCompartmentAdapter() {
+		if (umlCompartmentItemProvider == null) {
+			umlCompartmentItemProvider = new UmlCompartmentItemProvider(this);
+		}
+
+		return umlCompartmentItemProvider;
+	}
+
+	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlLabel} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlLabelItemProvider umlLabelItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlLabel}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createUmlLabelAdapter() {
+		if (umlLabelItemProvider == null) {
+			umlLabelItemProvider = new UmlLabelItemProvider(this);
+		}
+
+		return umlLabelItemProvider;
+	}
+
+	/**
+	 * This returns the root adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public ComposeableAdapterFactory getRootAdapterFactory() {
+		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
+	}
+
+	/**
+	 * This sets the composed adapter factory that contains this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
+		this.parentAdapterFactory = parentAdapterFactory;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object type) {
+		return supportedTypes.contains(type) || super.isFactoryForType(type);
+	}
+
+	/**
+	 * This implementation substitutes the factory itself as the key for the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter adapt(Notifier notifier, Object type) {
+		return super.adapt(notifier, this);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+				return adapter;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * This adds a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void addListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.addListener(notifyChangedListener);
+	}
+
+	/**
+	 * This removes a listener.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
+		changeNotifier.removeListener(notifyChangedListener);
+	}
+
+	/**
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void fireNotifyChanged(Notification notification) {
+		changeNotifier.fireNotifyChanged(notification);
+
+		if (parentAdapterFactory != null) {
+			parentAdapterFactory.fireNotifyChanged(notification);
+		}
+	}
+
+	/**
+	 * This disposes all of the item providers created by this factory. 
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void dispose() {
+		if (umlDiagramItemProvider != null) umlDiagramItemProvider.dispose();
+		if (umlShapeItemProvider != null) umlShapeItemProvider.dispose();
+		if (umlStyleItemProvider != null) umlStyleItemProvider.dispose();
+		if (umlEdgeItemProvider != null) umlEdgeItemProvider.dispose();
+		if (umlCompartmentItemProvider != null) umlCompartmentItemProvider.dispose();
+		if (umlLabelItemProvider != null) umlLabelItemProvider.dispose();
+	}
+
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java
new file mode 100644
index 00000000000..18da0c46f80
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java
@@ -0,0 +1,158 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.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.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
+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.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlCompartment;
+import org.eclipse.papyrus.umldi.UmlCompartmentKind;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlCompartment} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UmlCompartmentItemProvider
+	extends UmlShapeItemProvider
+	implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource,
+		IItemColorProvider,
+		IItemFontProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlCompartmentItemProvider(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);
+
+			addKindPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Kind feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addKindPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_UmlCompartment_kind_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_UmlCompartment_kind_feature", "_UI_UmlCompartment_type"),
+				 UMLDIPackage.Literals.UML_COMPARTMENT__KIND,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns UmlCompartment.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/UmlCompartment"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		UmlCompartmentKind labelValue = ((UmlCompartment)object).getKind();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ?
+			getString("_UI_UmlCompartment_type") :
+			getString("_UI_UmlCompartment_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(UmlCompartment.class)) {
+			case UMLDIPackage.UML_COMPARTMENT__KIND:
+				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/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java
new file mode 100644
index 00000000000..7406e236d63
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java
@@ -0,0 +1,290 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.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.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
+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.ViewerNotification;
+
+import org.eclipse.papyrus.dd.di.provider.DiagramElementItemProvider;
+
+import org.eclipse.papyrus.umldi.UMLDIFactory;
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlDiagramElement;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlDiagramElement} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UmlDiagramElementItemProvider
+	extends DiagramElementItemProvider
+	implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource,
+		IItemColorProvider,
+		IItemFontProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlDiagramElementItemProvider(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);
+
+			addUmlModelElementPropertyDescriptor(object);
+			addSharedUmlStylePropertyDescriptor(object);
+			addTargetUmlEdgePropertyDescriptor(object);
+			addSourceUmlEdgePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Uml Model Element feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addUmlModelElementPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_UmlDiagramElement_umlModelElement_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_umlModelElement_feature", "_UI_UmlDiagramElement_type"),
+				 UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Shared Uml Style feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSharedUmlStylePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_UmlDiagramElement_sharedUmlStyle_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sharedUmlStyle_feature", "_UI_UmlDiagramElement_type"),
+				 UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Target Uml Edge feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addTargetUmlEdgePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_UmlDiagramElement_targetUmlEdge_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_targetUmlEdge_feature", "_UI_UmlDiagramElement_type"),
+				 UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Source Uml Edge feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSourceUmlEdgePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_UmlDiagramElement_sourceUmlEdge_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sourceUmlEdge_feature", "_UI_UmlDiagramElement_type"),
+				 UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE);
+			childrenFeatures.add(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_UmlDiagramElement_type");
+	}
+
+	/**
+	 * 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(UmlDiagramElement.class)) {
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				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);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE,
+				 UMLDIFactory.eINSTANCE.createUmlStyle()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT,
+				 UMLDIFactory.eINSTANCE.createUmlShape()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT,
+				 UMLDIFactory.eINSTANCE.createUmlDiagram()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT,
+				 UMLDIFactory.eINSTANCE.createUmlEdge()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT,
+				 UMLDIFactory.eINSTANCE.createUmlCompartment()));
+
+		newChildDescriptors.add
+			(createChildParameter
+				(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT,
+				 UMLDIFactory.eINSTANCE.createUmlLabel()));
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return UMLDIEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java
new file mode 100644
index 00000000000..eade00ee446
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java
@@ -0,0 +1,206 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.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.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
+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.dd.di.DIPackage;
+
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlDiagram;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlDiagram} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UmlDiagramItemProvider
+	extends UmlShapeItemProvider
+	implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource,
+		IItemColorProvider,
+		IItemFontProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlDiagramItemProvider(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);
+
+			addNamePropertyDescriptor(object);
+			addDocumentationPropertyDescriptor(object);
+			addResolutionPropertyDescriptor(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_Diagram_name_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"),
+				 DIPackage.Literals.DIAGRAM__NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Documentation feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addDocumentationPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Diagram_documentation_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"),
+				 DIPackage.Literals.DIAGRAM__DOCUMENTATION,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Resolution feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addResolutionPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_Diagram_resolution_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"),
+				 DIPackage.Literals.DIAGRAM__RESOLUTION,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns UmlDiagram.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/UmlDiagram"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((UmlDiagram)object).getName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_UmlDiagram_type") :
+			getString("_UI_UmlDiagram_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(UmlDiagram.class)) {
+			case UMLDIPackage.UML_DIAGRAM__NAME:
+			case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
+			case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
+				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/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java
new file mode 100644
index 00000000000..f2fae7e695f
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java
@@ -0,0 +1,216 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.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.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
+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.ViewerNotification;
+
+import org.eclipse.papyrus.dd.dc.DCFactory;
+
+import org.eclipse.papyrus.dd.di.DIPackage;
+
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlEdge;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlEdge} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UmlEdgeItemProvider
+	extends UmlDiagramElementItemProvider
+	implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource,
+		IItemColorProvider,
+		IItemFontProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlEdgeItemProvider(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);
+
+			addSourceUmlDiagramElementPropertyDescriptor(object);
+			addTargetUmlDiagramElementPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Source Uml Diagram Element feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addSourceUmlDiagramElementPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_UmlEdge_sourceUmlDiagramElement_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_sourceUmlDiagramElement_feature", "_UI_UmlEdge_type"),
+				 UMLDIPackage.Literals.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Target Uml Diagram Element feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addTargetUmlDiagramElementPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_UmlEdge_targetUmlDiagramElement_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_targetUmlDiagramElement_feature", "_UI_UmlEdge_type"),
+				 UMLDIPackage.Literals.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT,
+				 true,
+				 false,
+				 true,
+				 null,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(DIPackage.Literals.EDGE__WAYPOINT);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns UmlEdge.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/UmlEdge"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_UmlEdge_type");
+	}
+
+	/**
+	 * 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(UmlEdge.class)) {
+			case UMLDIPackage.UML_EDGE__WAYPOINT:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				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);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(DIPackage.Literals.EDGE__WAYPOINT,
+				 DCFactory.eINSTANCE.createPoint()));
+	}
+
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java
new file mode 100644
index 00000000000..fc7343fbaea
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java
@@ -0,0 +1,158 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.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.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
+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.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlLabel;
+import org.eclipse.papyrus.umldi.UmlLabelKind;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlLabel} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UmlLabelItemProvider
+	extends UmlShapeItemProvider
+	implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource,
+		IItemColorProvider,
+		IItemFontProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlLabelItemProvider(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);
+
+			addKindPropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Kind feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addKindPropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_UmlLabel_kind_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_UmlLabel_kind_feature", "_UI_UmlLabel_type"),
+				 UMLDIPackage.Literals.UML_LABEL__KIND,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns UmlLabel.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/UmlLabel"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		UmlLabelKind labelValue = ((UmlLabel)object).getKind();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ?
+			getString("_UI_UmlLabel_type") :
+			getString("_UI_UmlLabel_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(UmlLabel.class)) {
+			case UMLDIPackage.UML_LABEL__KIND:
+				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/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java
new file mode 100644
index 00000000000..cdea1b937d4
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java
@@ -0,0 +1,169 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.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.ecore.EStructuralFeature;
+
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
+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.ViewerNotification;
+
+import org.eclipse.papyrus.dd.dc.DCFactory;
+
+import org.eclipse.papyrus.dd.di.DIPackage;
+
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlShape;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlShape} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UmlShapeItemProvider
+	extends UmlDiagramElementItemProvider
+	implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource,
+		IItemColorProvider,
+		IItemFontProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlShapeItemProvider(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);
+
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
+			super.getChildrenFeatures(object);
+			childrenFeatures.add(DIPackage.Literals.SHAPE__BOUNDS);
+		}
+		return childrenFeatures;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
+		// Check the type of the specified child object and return the proper feature to use for
+		// adding (see {@link AddCommand}) it as a child.
+
+		return super.getChildFeature(object, child);
+	}
+
+	/**
+	 * This returns UmlShape.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/UmlShape"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		return getString("_UI_UmlShape_type");
+	}
+
+	/**
+	 * 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(UmlShape.class)) {
+			case UMLDIPackage.UML_SHAPE__BOUNDS:
+				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+				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);
+
+		newChildDescriptors.add
+			(createChildParameter
+				(DIPackage.Literals.SHAPE__BOUNDS,
+				 DCFactory.eINSTANCE.createBounds()));
+	}
+
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java
new file mode 100644
index 00000000000..5b07392aee5
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java
@@ -0,0 +1,195 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.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.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemColorProvider;
+import org.eclipse.emf.edit.provider.IItemFontProvider;
+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.dd.di.provider.StyleItemProvider;
+
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlStyle;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlStyle} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UmlStyleItemProvider
+	extends StyleItemProvider
+	implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource,
+		IItemColorProvider,
+		IItemFontProvider {
+	/**
+	 * This constructs an instance from a factory and a notifier.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlStyleItemProvider(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);
+
+			addFontNamePropertyDescriptor(object);
+			addFontSizePropertyDescriptor(object);
+		}
+		return itemPropertyDescriptors;
+	}
+
+	/**
+	 * This adds a property descriptor for the Font Name feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addFontNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_UmlStyle_fontName_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontName_feature", "_UI_UmlStyle_type"),
+				 UMLDIPackage.Literals.UML_STYLE__FONT_NAME,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This adds a property descriptor for the Font Size feature.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void addFontSizePropertyDescriptor(Object object) {
+		itemPropertyDescriptors.add
+			(createItemPropertyDescriptor
+				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+				 getResourceLocator(),
+				 getString("_UI_UmlStyle_fontSize_feature"),
+				 getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontSize_feature", "_UI_UmlStyle_type"),
+				 UMLDIPackage.Literals.UML_STYLE__FONT_SIZE,
+				 true,
+				 false,
+				 false,
+				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
+				 null,
+				 null));
+	}
+
+	/**
+	 * This returns UmlStyle.gif.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object getImage(Object object) {
+		return overlayImage(object, getResourceLocator().getImage("full/obj16/UmlStyle"));
+	}
+
+	/**
+	 * This returns the label text for the adapted class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String getText(Object object) {
+		String label = ((UmlStyle)object).getFontName();
+		return label == null || label.length() == 0 ?
+			getString("_UI_UmlStyle_type") :
+			getString("_UI_UmlStyle_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(UmlStyle.class)) {
+			case UMLDIPackage.UML_STYLE__FONT_NAME:
+			case UMLDIPackage.UML_STYLE__FONT_SIZE:
+				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);
+	}
+
+	/**
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		return UMLDIEditPlugin.INSTANCE;
+	}
+
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/.classpath b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/.classpath
new file mode 100644
index 00000000000..3bc247511f0
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/.project b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/.project
new file mode 100644
index 00000000000..53d8c8f9492
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.umldi.editor</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..b39f5a26141
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/META-INF/MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.umldi.editor;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.papyrus.umldi.editor.UMLDIEditorPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.umldi.editor
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources;visibility:=reexport,
+ org.eclipse.papyrus.umldi.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.emf.edit.ui;visibility:=reexport,
+ org.eclipse.ui.ide;visibility:=reexport,
+ org.eclipse.papyrus.dd.edit;visibility:=reexport,
+ org.eclipse.emf.ecore.edit;visibility:=reexport,
+ org.eclipse.uml2.uml.edit;visibility:=reexport,
+ org.eclipse.papyrus.dd.editor;bundle-version="1.0.0",
+ org.eclipse.m2m.qvt.oml;bundle-version="3.3.0"
+Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/build.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/build.properties
new file mode 100644
index 00000000000..79182fd96bc
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/build.properties
@@ -0,0 +1,18 @@
+# Copyright (c) 2014 CEA LIST.
+#  
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#  
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/
+output.. = bin
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/icons/Transform.png b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/icons/Transform.png
new file mode 100644
index 00000000000..0b1c31ce10a
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/icons/Transform.png
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/icons/full/obj16/UMLDIModelFile.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/icons/full/obj16/UMLDIModelFile.gif
new file mode 100644
index 00000000000..fa21681600f
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/icons/full/obj16/UMLDIModelFile.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/icons/full/wizban/NewUMLDI.gif b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/icons/full/wizban/NewUMLDI.gif
new file mode 100644
index 00000000000..0e69a72e126
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/icons/full/wizban/NewUMLDI.gif
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/plugin.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/plugin.properties
new file mode 100644
index 00000000000..0cbf1bc9792
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/plugin.properties
@@ -0,0 +1,61 @@
+# Copyright (c) 2014 CEA LIST.
+#  
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#  
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+pluginName = UMLDI Editor
+providerName = www.example.org
+
+_UI_UMLDIEditor_menu = &UMLDI Editor
+
+_UI_CreateChild_menu_item = &New Child
+_UI_CreateSibling_menu_item = N&ew Sibling
+
+_UI_ShowPropertiesView_menu_item = Show &Properties View
+_UI_RefreshViewer_menu_item = &Refresh
+
+_UI_SelectionPage_label = Selection
+_UI_ParentPage_label = Parent
+_UI_ListPage_label = List
+_UI_TreePage_label = Tree
+_UI_TablePage_label = Table
+_UI_TreeWithColumnsPage_label = Tree with Columns
+_UI_ObjectColumn_label = Object
+_UI_SelfColumn_label = Self
+
+_UI_NoObjectSelected = Selected Nothing
+_UI_SingleObjectSelected = Selected Object: {0}
+_UI_MultiObjectSelected = Selected {0} Objects
+
+_UI_OpenEditorError_label = Open Editor
+
+_UI_Wizard_category = Example EMF Model Creation Wizards
+
+_UI_CreateModelError_message = Problems encountered in file "{0}"
+
+_UI_UMLDIModelWizard_label = UMLDI Model
+_UI_UMLDIModelWizard_description = Create a new UMLDI model
+
+_UI_UMLDIEditor_label = UMLDI Model Editor
+
+_UI_UMLDIEditorFilenameDefaultBase = My
+_UI_UMLDIEditorFilenameExtensions = umldi
+
+_UI_Wizard_label = New
+
+_WARN_FilenameExtension = The file name must end in ''.{0}''
+_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
+
+_UI_ModelObject = &Model Object
+_UI_XMLEncoding = &XML Encoding
+_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
+_UI_Wizard_initial_object_description = Select a model object to create
+
+_UI_FileConflict_label = File Conflict
+_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
+
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/plugin.xml b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/plugin.xml
new file mode 100644
index 00000000000..c61a77f2cb1
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/plugin.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2014 CEA LIST.
+  
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+  
+ Contributors:
+  CEA LIST - Initial API and implementation
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.ui.newWizards">
+      <!-- @generated UMLDI -->
+      <category
+            id="org.eclipse.emf.ecore.Wizard.category.ID"
+            name="%_UI_Wizard_category"/>
+      <wizard
+            id="org.eclipse.papyrus.umldi.editor.UMLDIModelWizard"
+            name="%_UI_UMLDIModelWizard_label"
+            class="org.eclipse.papyrus.umldi.editor.UMLDIModelWizard"
+            category="org.eclipse.emf.ecore.Wizard.category.ID"
+            icon="icons/full/obj16/UMLDIModelFile.gif">
+         <description>%_UI_UMLDIModelWizard_description</description>
+         <selection class="org.eclipse.core.resources.IResource"/>
+      </wizard>
+   </extension>
+
+   <extension point="org.eclipse.ui.editors">
+      <!-- @generated UMLDI -->
+      <editor
+            id="org.eclipse.papyrus.umldi.editor.UMLDIEditor"
+            name="%_UI_UMLDIEditor_label"
+            icon="icons/full/obj16/UMLDIModelFile.gif"
+            extensions="umldi"
+            class="org.eclipse.papyrus.umldi.editor.UMLDIEditor"
+            contributorClass="org.eclipse.papyrus.umldi.editor.UMLDIActionBarContributor">
+      </editor>
+   </extension>
+
+</plugin>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java
new file mode 100644
index 00000000000..bfddf39a957
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java
@@ -0,0 +1,537 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.editor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the UMLDI model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UMLDIActionBarContributor
+	extends EditingDomainActionBarContributor
+	implements ISelectionChangedListener {
+	/**
+	 * This keeps track of the active editor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IEditorPart activeEditorPart;
+
+	/**
+	 * This keeps track of the current selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected ISelectionProvider selectionProvider;
+
+	/**
+	 * This action opens the Properties view.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction showPropertiesViewAction =
+		new Action(UMLDIEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
+			@Override
+			public void run() {
+				try {
+					getPage().showView("org.eclipse.ui.views.PropertySheet");
+				}
+				catch (PartInitException exception) {
+					UMLDIEditorPlugin.INSTANCE.log(exception);
+				}
+			}
+		};
+
+	/**
+	 * This action refreshes the viewer of the current editor if the editor
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IAction refreshViewerAction =
+		new Action(UMLDIEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
+			@Override
+			public boolean isEnabled() {
+				return activeEditorPart instanceof IViewerProvider;
+			}
+
+			@Override
+			public void run() {
+				if (activeEditorPart instanceof IViewerProvider) {
+					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+					if (viewer != null) {
+						viewer.refresh();
+					}
+				}
+			}
+		};
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createChildActions;
+
+	/**
+	 * This will contain a map of {@link org.eclipse.emf.edit.ui.action.CreateChildAction}s, keyed by sub-menu text.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<String, Collection<IAction>> createChildSubmenuActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createChildMenuManager;
+
+	/**
+	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+	 * generated for the current selection by the item provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> createSiblingActions;
+
+	/**
+	 * This will contain a map of {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction}s, keyed by submenu text.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<String, Collection<IAction>> createSiblingSubmenuActions;
+
+	/**
+	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IMenuManager createSiblingMenuManager;
+
+	/**
+	 * This creates an instance of the contributor.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDIActionBarContributor() {
+		super(ADDITIONS_LAST_STYLE);
+		loadResourceAction = new LoadResourceAction();
+		validateAction = new ValidateAction();
+		controlAction = new ControlAction();
+	}
+
+	/**
+	 * This adds Separators for editor additions to the tool bar.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
+		toolBarManager.add(new Separator("umldi-settings"));
+		toolBarManager.add(new Separator("umldi-additions"));
+	}
+
+	/**
+	 * This adds to the menu bar a menu and some separators for editor additions,
+	 * as well as the sub-menus for object creation items.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void contributeToMenu(IMenuManager menuManager) {
+		super.contributeToMenu(menuManager);
+
+		IMenuManager submenuManager = new MenuManager(UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIEditor_menu"), "org.eclipse.papyrus.umldiMenuID");
+		menuManager.insertAfter("additions", submenuManager);
+		submenuManager.add(new Separator("settings"));
+		submenuManager.add(new Separator("actions"));
+		submenuManager.add(new Separator("additions"));
+		submenuManager.add(new Separator("additions-end"));
+
+		// Prepare for CreateChild item addition or removal.
+		//
+		createChildMenuManager = new MenuManager(UMLDIEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		submenuManager.insertBefore("additions", createChildMenuManager);
+
+		// Prepare for CreateSibling item addition or removal.
+		//
+		createSiblingMenuManager = new MenuManager(UMLDIEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+		submenuManager.insertBefore("additions", createSiblingMenuManager);
+
+		// Force an update because Eclipse hides empty menus now.
+		//
+		submenuManager.addMenuListener
+			(new IMenuListener() {
+				 public void menuAboutToShow(IMenuManager menuManager) {
+					 menuManager.updateAll(true);
+				 }
+			 });
+
+		addGlobalActions(submenuManager);
+	}
+
+	/**
+	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void setActiveEditor(IEditorPart part) {
+		super.setActiveEditor(part);
+		activeEditorPart = part;
+
+		// Switch to the new selection provider.
+		//
+		if (selectionProvider != null) {
+			selectionProvider.removeSelectionChangedListener(this);
+		}
+		if (part == null) {
+			selectionProvider = null;
+		}
+		else {
+			selectionProvider = part.getSite().getSelectionProvider();
+			selectionProvider.addSelectionChangedListener(this);
+
+			// Fake a selection changed event to update the menus.
+			//
+			if (selectionProvider.getSelection() != null) {
+				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+			}
+		}
+	}
+
+	/**
+	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+	 * that can be added to the selected object and updating the menus accordingly.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void selectionChanged(SelectionChangedEvent event) {
+		// Remove any menu items for old selection.
+		//
+		if (createChildMenuManager != null) {
+			depopulateManager(createChildMenuManager, createChildSubmenuActions);
+			depopulateManager(createChildMenuManager, createChildActions);
+		}
+		if (createSiblingMenuManager != null) {
+			depopulateManager(createSiblingMenuManager, createSiblingSubmenuActions);
+			depopulateManager(createSiblingMenuManager, createSiblingActions);
+		}
+
+		// Query the new selection for appropriate new child/sibling descriptors
+		//
+		Collection<?> newChildDescriptors = null;
+		Collection<?> newSiblingDescriptors = null;
+
+		ISelection selection = event.getSelection();
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+			Object object = ((IStructuredSelection)selection).getFirstElement();
+
+			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+			newChildDescriptors = domain.getNewChildDescriptors(object, null);
+			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+		}
+
+		// Generate actions for selection; populate and redraw the menus.
+		//
+		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createChildSubmenuActions = extractSubmenuActions(createChildActions);
+		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+		createSiblingSubmenuActions = extractSubmenuActions(createSiblingActions);
+
+		if (createChildMenuManager != null) {
+			populateManager(createChildMenuManager, createChildSubmenuActions, null);
+			populateManager(createChildMenuManager, createChildActions, null);
+			createChildMenuManager.update(true);
+		}
+		if (createSiblingMenuManager != null) {
+			populateManager(createSiblingMenuManager, createSiblingSubmenuActions, null);
+			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			createSiblingMenuManager.update(true);
+		}
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+	 * and returns the collection of these actions.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+		Collection<IAction> actions = new ArrayList<IAction>();
+		if (descriptors != null) {
+			for (Object descriptor : descriptors) {
+				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+			}
+		}
+		return actions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+	 * by inserting them before the specified contribution item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+		if (actions != null) {
+			for (IAction action : actions) {
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, action);
+				}
+				else {
+					manager.add(action);
+				}
+			}
+		}
+	}
+		
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				// Look into SubContributionItems
+				//
+				IContributionItem contributionItem = items[i];
+				while (contributionItem instanceof SubContributionItem) {
+					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+				}
+
+				// Delete the ActionContributionItems with matching action.
+				//
+				if (contributionItem instanceof ActionContributionItem) {
+					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					if (actions.contains(action)) {
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This extracts those actions in the <code>submenuActions</code> collection whose text is qualified and returns
+	 * a map of these actions, keyed by submenu text.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Map<String, Collection<IAction>> extractSubmenuActions(Collection<IAction> createActions) {
+		Map<String, Collection<IAction>> createSubmenuActions = new LinkedHashMap<String, Collection<IAction>>();
+		if (createActions != null) {
+			for (Iterator<IAction> actions = createActions.iterator(); actions.hasNext(); ) {
+				IAction action = actions.next();
+				StringTokenizer st = new StringTokenizer(action.getText(), "|");
+				if (st.countTokens() == 2) {
+					String text = st.nextToken().trim();
+					Collection<IAction> submenuActions = createSubmenuActions.get(text);
+					if (submenuActions == null) {
+						createSubmenuActions.put(text, submenuActions = new ArrayList<IAction>());
+					}
+					action.setText(st.nextToken().trim());
+					submenuActions.add(action);
+					actions.remove();
+				}
+			}
+		}
+		return createSubmenuActions;
+	}
+
+	/**
+	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.MenuManager}s containing
+	 * {@link org.eclipse.jface.action.ActionContributionItem}s based on the {@link org.eclipse.jface.action.IAction}s
+	 * contained in the <code>submenuActions</code> collection, by inserting them before the specified contribution
+	 * item <code>contributionID</code>.
+	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void populateManager(IContributionManager manager, Map<String, Collection<IAction>> submenuActions, String contributionID) {
+		if (submenuActions != null) {
+			for (Map.Entry<String, Collection<IAction>> entry : submenuActions.entrySet()) {
+				MenuManager submenuManager = new MenuManager(entry.getKey());
+				if (contributionID != null) {
+					manager.insertBefore(contributionID, submenuManager);
+				}
+				else {
+					manager.add(submenuManager);
+				}
+				populateManager(submenuManager, entry.getValue(), null);
+			}
+		}
+	}
+
+	/**
+	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.MenuManager}s and their
+	 * {@link org.eclipse.jface.action.ActionContributionItem}s based on the {@link org.eclipse.jface.action.IAction}s
+	 * contained in the <code>submenuActions</code> map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void depopulateManager(IContributionManager manager, Map<String, Collection<IAction>> submenuActions) {
+		if (submenuActions != null) {
+			IContributionItem[] items = manager.getItems();
+			for (int i = 0; i < items.length; i++) {
+				IContributionItem contributionItem = items[i];
+				if (contributionItem instanceof MenuManager) {
+					MenuManager submenuManager = (MenuManager)contributionItem;
+					if (submenuActions.containsKey(submenuManager.getMenuText())) {
+						depopulateManager(submenuManager, submenuActions.get(contributionItem));
+						manager.remove(contributionItem);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * This populates the pop-up menu before it appears.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void menuAboutToShow(IMenuManager menuManager) {
+		super.menuAboutToShow(menuManager);
+		MenuManager submenuManager = null;
+
+		submenuManager = new MenuManager(UMLDIEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		populateManager(submenuManager, createChildSubmenuActions, null);
+		populateManager(submenuManager, createChildActions, null);
+		menuManager.insertBefore("edit", submenuManager);
+
+		submenuManager = new MenuManager(UMLDIEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+		populateManager(submenuManager, createSiblingSubmenuActions, null);
+		populateManager(submenuManager, createSiblingActions, null);
+		menuManager.insertBefore("edit", submenuManager);
+	}
+
+	/**
+	 * This inserts global actions before the "additions-end" separator.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected void addGlobalActions(IMenuManager menuManager) {
+		menuManager.insertAfter("additions-end", new Separator("ui-actions"));
+		menuManager.insertAfter("ui-actions", showPropertiesViewAction);
+
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		menuManager.insertAfter("ui-actions", refreshViewerAction);
+
+		super.addGlobalActions(menuManager);
+	}
+
+	/**
+	 * This ensures that a delete action will clean up all references to deleted objects.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean removeAllReferencesOnDelete() {
+		return true;
+	}
+
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIEditor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIEditor.java
new file mode 100644
index 00000000000..ff29f09add6
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIEditor.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.editor;
+
+import org.eclipse.papyrus.dd.editor.DDEditor;
+import org.eclipse.papyrus.dd.editor.DDEditorPlugin;
+import org.eclipse.papyrus.dd.editor.DDSourcePage;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the DI model multi-page editor
+ */
+public class UMLDIEditor extends DDEditor {
+
+	/**
+	 * The editor id
+	 */
+	public static final String ID = UMLDIEditor.class.getName();
+
+	@Override
+	protected void addPages() {
+		try {
+			addPage(new UMLDIModelPage(this), getEditorInput());
+			addPage(new DDSourcePage(this), getEditorInput());
+		} catch (PartInitException e) {
+			DDEditorPlugin.INSTANCE.log(e);
+		}
+	}
+
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIEditorPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIEditorPlugin.java
new file mode 100644
index 00000000000..19d8d154ce9
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIEditorPlugin.java
@@ -0,0 +1,119 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.editor;
+
+import org.eclipse.emf.common.EMFPlugin;
+import org.eclipse.emf.common.ui.EclipseUIPlugin;
+import org.eclipse.emf.common.util.ResourceLocator;
+import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.resource.ImageRegistry;
+import org.eclipse.papyrus.dd.edit.DDEditPlugin;
+import org.eclipse.uml2.uml.edit.UMLEditPlugin;
+
+/**
+ * This is the central singleton for the UMLDI editor plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class UMLDIEditorPlugin extends EMFPlugin {
+	
+	public static final String IMAGE_TRANSFORM = "Transform";
+	
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final UMLDIEditorPlugin INSTANCE = new UMLDIEditorPlugin();
+	
+	/**
+	 * Keep track of the singleton.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static Implementation plugin;
+
+	/**
+	 * Create the instance.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDIEditorPlugin() {
+		super
+			(new ResourceLocator [] {
+				DDEditPlugin.INSTANCE,
+				EcoreEditPlugin.INSTANCE,
+				UMLEditPlugin.INSTANCE,
+			});
+	}
+
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getPluginResourceLocator() {
+		return plugin;
+	}
+	
+	/**
+	 * Returns the singleton instance of the Eclipse plugin.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the singleton instance.
+	 * @generated
+	 */
+	public static Implementation getPlugin() {
+		return plugin;
+	}
+	
+	/**
+	 * The actual implementation of the Eclipse <b>Plugin</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static class Implementation extends EclipseUIPlugin {
+		/**
+		 * Creates an instance.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public Implementation() {
+			super();
+	
+			// Remember the static instance.
+			//
+			plugin = this;
+		}
+
+		@Override
+		protected void initializeImageRegistry(ImageRegistry reg) {
+			super.initializeImageRegistry(reg);
+			reg.put(IMAGE_TRANSFORM, ImageDescriptor.createFromURL(getBundle().getEntry("icons/Transform.png")));
+		}
+		
+	}
+
+	public static ImageDescriptor getImageDescriptor(String id) {
+		return getPlugin().getImageRegistry().getDescriptor(id);
+	}
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java
new file mode 100644
index 00000000000..9e1a0626812
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.editor;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.common.util.BasicDiagnostic;
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.m2m.qvt.oml.BasicModelExtent;
+import org.eclipse.m2m.qvt.oml.ExecutionContextImpl;
+import org.eclipse.m2m.qvt.oml.ExecutionDiagnostic;
+import org.eclipse.m2m.qvt.oml.ModelExtent;
+import org.eclipse.m2m.qvt.oml.TransformationExecutor;
+import org.eclipse.papyrus.dd.editor.DDEditor;
+import org.eclipse.papyrus.dd.editor.DDModelPage;
+import org.eclipse.ui.statushandlers.StatusManager;
+
+/**
+ * This is a page that shows a model tree for a UML DI editor
+ */
+public class UMLDIModelPage extends DDModelPage {
+
+	public UMLDIModelPage(DDEditor editor) {
+		super(editor);
+	}
+
+	@Override
+	public void setupActions(IToolBarManager manager) {
+		super.setupActions(manager);
+		
+		Action action;
+		
+		action = new Action("Transform to DG") {
+			public void run() {
+				EditingDomain editingDomain = getDDEditor().getEditingDomain();
+				Resource inResource = editingDomain.getResourceSet().getResources().get(0);
+				EList<EObject> inObjects = inResource.getContents();
+
+				ModelExtent input = new BasicModelExtent(inObjects);		
+				ModelExtent output = new BasicModelExtent();
+
+				ExecutionContextImpl context = new ExecutionContextImpl();
+				context.setConfigProperty("keepModeling", true);
+
+				URI transformationURI = URI.createURI("platform:/plugin/org.eclipse.papyrus.umldi2dg/transforms/umldi2dg.qvto");
+				TransformationExecutor executor = new TransformationExecutor(transformationURI);
+				ExecutionDiagnostic result = executor.execute(context, input, output);
+				if(result.getSeverity() == Diagnostic.OK) {
+					try {
+						List<EObject> outObjects = output.getContents();
+					    ResourceSet outResourceSet = new ResourceSetImpl();
+						Resource outResource = outResourceSet.createResource(inResource.getURI().trimFileExtension().appendFileExtension("dg"));
+						outResource.getContents().addAll(outObjects);
+						outResource.save(Collections.emptyMap());
+					} catch (IOException e) {
+						UMLDIEditorPlugin.getPlugin().log(e);
+					}
+				} else {
+					IStatus status = BasicDiagnostic.toIStatus(result);
+					UMLDIEditorPlugin.getPlugin().getLog().log(status);
+					StatusManager.getManager().handle(status, StatusManager.BLOCK);
+				}			
+			}
+		};
+		action.setToolTipText("Transform to DG");
+		action.setImageDescriptor(UMLDIEditorPlugin.getImageDescriptor(UMLDIEditorPlugin.IMAGE_TRANSFORM));
+		manager.appendToGroup("Page", action);
+	}
+
+	
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java
new file mode 100644
index 00000000000..40b856f9dec
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java
@@ -0,0 +1,637 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.editor;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.emf.common.CommonPlugin;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.ModifyEvent;
+
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+import org.eclipse.papyrus.umldi.UMLDIFactory;
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.provider.UMLDIEditPlugin;
+
+
+import org.eclipse.core.runtime.Path;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UMLDIModelWizard extends Wizard implements INewWizard {
+	/**
+	 * The supported extensions for created files.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<String> FILE_EXTENSIONS =
+		Collections.unmodifiableList(Arrays.asList(UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIEditorFilenameExtensions").split("\\s*,\\s*")));
+
+	/**
+	 * A formatted list of supported file extensions, suitable for display.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final String FORMATTED_FILE_EXTENSIONS =
+		UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+
+	/**
+	 * This caches an instance of the model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UMLDIPackage umldiPackage = UMLDIPackage.eINSTANCE;
+
+	/**
+	 * This caches an instance of the model factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UMLDIFactory umldiFactory = umldiPackage.getUMLDIFactory();
+
+	/**
+	 * This is the file creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UMLDIModelWizardNewFileCreationPage newFileCreationPage;
+
+	/**
+	 * This is the initial object creation page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UMLDIModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+	/**
+	 * Remember the selection during initialization for populating the default container.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IStructuredSelection selection;
+
+	/**
+	 * Remember the workbench during initialization.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected IWorkbench workbench;
+
+	/**
+	 * Caches the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected List<String> initialObjectNames;
+
+	/**
+	 * This just records the information.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
+		this.workbench = workbench;
+		this.selection = selection;
+		setWindowTitle(UMLDIEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(UMLDIEditorPlugin.INSTANCE.getImage("full/wizban/NewUMLDI")));
+	}
+
+	/**
+	 * Returns the names of the types that can be created as the root object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
+			initialObjectNames = new ArrayList<String>();
+			for (EClassifier eClassifier : umldiPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
+					EClass eClass = (EClass)eClassifier;
+					if (!eClass.isAbstract()) {
+						initialObjectNames.add(eClass.getName());
+					}
+				}
+			}
+			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+		}
+		return initialObjectNames;
+	}
+
+	/**
+	 * Create a new model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected EObject createInitialModel() {
+		EClass eClass = (EClass)umldiPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EObject rootObject = umldiFactory.create(eClass);
+		return rootObject;
+	}
+
+	/**
+	 * Do the work after everything is specified.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean performFinish() {
+		try {
+			// Remember the file.
+			//
+			final IFile modelFile = getModelFile();
+
+			// Do the work within an operation.
+			//
+			WorkspaceModifyOperation operation =
+				new WorkspaceModifyOperation() {
+					@Override
+					protected void execute(IProgressMonitor progressMonitor) {
+						try {
+							// Create a resource set
+							//
+							ResourceSet resourceSet = new ResourceSetImpl();
+
+							// Get the URI of the model file.
+							//
+							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+							// Create a resource for this file.
+							//
+							Resource resource = resourceSet.createResource(fileURI);
+
+							// Add the initial model object to the contents.
+							//
+							EObject rootObject = createInitialModel();
+							if (rootObject != null) {
+								resource.getContents().add(rootObject);
+							}
+
+							// Save the contents of the resource to the file system.
+							//
+							Map<Object, Object> options = new HashMap<Object, Object>();
+							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+							resource.save(options);
+						}
+						catch (Exception exception) {
+							UMLDIEditorPlugin.INSTANCE.log(exception);
+						}
+						finally {
+							progressMonitor.done();
+						}
+					}
+				};
+
+			getContainer().run(false, false, operation);
+
+			// Select the new file resource in the current view.
+			//
+			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchPage page = workbenchWindow.getActivePage();
+			final IWorkbenchPart activePart = page.getActivePart();
+			if (activePart instanceof ISetSelectionTarget) {
+				final ISelection targetSelection = new StructuredSelection(modelFile);
+				getShell().getDisplay().asyncExec
+					(new Runnable() {
+						 public void run() {
+							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+						 }
+					 });
+			}
+
+			// Open an editor on the new file.
+			//
+			try {
+				page.openEditor
+					(new FileEditorInput(modelFile),
+					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
+			}
+			catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(), UMLDIEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+				return false;
+			}
+
+			return true;
+		}
+		catch (Exception exception) {
+			UMLDIEditorPlugin.INSTANCE.log(exception);
+			return false;
+		}
+	}
+
+	/**
+	 * This is the one page of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class UMLDIModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public UMLDIModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+			super(pageId, selection);
+		}
+
+		/**
+		 * The framework calls this to see if the file is correct.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		protected boolean validatePage() {
+			if (super.validatePage()) {
+				String extension = new Path(getFileName()).getFileExtension();
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
+					setErrorMessage(UMLDIEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					return false;
+				}
+				return true;
+			}
+			return false;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public IFile getModelFile() {
+			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+		}
+	}
+
+	/**
+	 * This is the page where the type of object to create is selected.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public class UMLDIModelWizardInitialObjectCreationPage extends WizardPage {
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo initialObjectField;
+
+		/**
+		 * @generated
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 */
+		protected List<String> encodings;
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Combo encodingField;
+
+		/**
+		 * Pass in the selection.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public UMLDIModelWizardInitialObjectCreationPage(String pageId) {
+			super(pageId);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public void createControl(Composite parent) {
+			Composite composite = new Composite(parent, SWT.NONE);
+			{
+				GridLayout layout = new GridLayout();
+				layout.numColumns = 1;
+				layout.verticalSpacing = 12;
+				composite.setLayout(layout);
+
+				GridData data = new GridData();
+				data.verticalAlignment = GridData.FILL;
+				data.grabExcessVerticalSpace = true;
+				data.horizontalAlignment = GridData.FILL;
+				composite.setLayoutData(data);
+			}
+
+			Label containerLabel = new Label(composite, SWT.LEFT);
+			{
+				containerLabel.setText(UMLDIEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				containerLabel.setLayoutData(data);
+			}
+
+			initialObjectField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				initialObjectField.setLayoutData(data);
+			}
+
+			for (String objectName : getInitialObjectNames()) {
+				initialObjectField.add(getLabel(objectName));
+			}
+
+			if (initialObjectField.getItemCount() == 1) {
+				initialObjectField.select(0);
+			}
+			initialObjectField.addModifyListener(validator);
+
+			Label encodingLabel = new Label(composite, SWT.LEFT);
+			{
+				encodingLabel.setText(UMLDIEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
+
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				encodingLabel.setLayoutData(data);
+			}
+			encodingField = new Combo(composite, SWT.BORDER);
+			{
+				GridData data = new GridData();
+				data.horizontalAlignment = GridData.FILL;
+				data.grabExcessHorizontalSpace = true;
+				encodingField.setLayoutData(data);
+			}
+
+			for (String encoding : getEncodings()) {
+				encodingField.add(encoding);
+			}
+
+			encodingField.select(0);
+			encodingField.addModifyListener(validator);
+
+			setPageComplete(validatePage());
+			setControl(composite);
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected ModifyListener validator =
+			new ModifyListener() {
+				public void modifyText(ModifyEvent e) {
+					setPageComplete(validatePage());
+				}
+			};
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected boolean validatePage() {
+			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		@Override
+		public void setVisible(boolean visible) {
+			super.setVisible(visible);
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
+					initialObjectField.clearSelection();
+					encodingField.setFocus();
+				}
+				else {
+					encodingField.clearSelection();
+					initialObjectField.setFocus();
+				}
+			}
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getInitialObjectName() {
+			String label = initialObjectField.getText();
+
+			for (String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
+					return name;
+				}
+			}
+			return null;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		public String getEncoding() {
+			return encodingField.getText();
+		}
+
+		/**
+		 * Returns the label for the specified type name.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected String getLabel(String typeName) {
+			try {
+				return UMLDIEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
+			}
+			catch(MissingResourceException mre) {
+				UMLDIEditorPlugin.INSTANCE.log(mre);
+			}
+			return typeName;
+		}
+
+		/**
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
+				encodings = new ArrayList<String>();
+				for (StringTokenizer stringTokenizer = new StringTokenizer(UMLDIEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
+					encodings.add(stringTokenizer.nextToken());
+				}
+			}
+			return encodings;
+		}
+	}
+
+	/**
+	 * The framework calls this to create the contents of the wizard.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+		@Override
+	public void addPages() {
+		// Create a page, set the title, and the initial model file name.
+		//
+		newFileCreationPage = new UMLDIModelWizardNewFileCreationPage("Whatever", selection);
+		newFileCreationPage.setTitle(UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIModelWizard_label"));
+		newFileCreationPage.setDescription(UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIModelWizard_description"));
+		newFileCreationPage.setFileName(UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+		addPage(newFileCreationPage);
+
+		// Try and get the resource selection to determine a current directory for the file dialog.
+		//
+		if (selection != null && !selection.isEmpty()) {
+			// Get the resource...
+			//
+			Object selectedElement = selection.iterator().next();
+			if (selectedElement instanceof IResource) {
+				// Get the resource parent, if its a file.
+				//
+				IResource selectedResource = (IResource)selectedElement;
+				if (selectedResource.getType() == IResource.FILE) {
+					selectedResource = selectedResource.getParent();
+				}
+
+				// This gives us a directory...
+				//
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+					// Set this for the container.
+					//
+					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+					// Make up a unique new name here.
+					//
+					String defaultModelBaseFilename = UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIEditorFilenameDefaultBase");
+					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
+					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
+					}
+					newFileCreationPage.setFileName(modelFilename);
+				}
+			}
+		}
+		initialObjectCreationPage = new UMLDIModelWizardInitialObjectCreationPage("Whatever2");
+		initialObjectCreationPage.setTitle(UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIModelWizard_label"));
+		initialObjectCreationPage.setDescription(UMLDIEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+		addPage(initialObjectCreationPage);
+	}
+
+	/**
+	 * Get the file from the page.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public IFile getModelFile() {
+		return newFileCreationPage.getModelFile();
+	}
+
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.classpath b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.classpath
new file mode 100644
index 00000000000..3bc247511f0
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.project b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.project
new file mode 100644
index 00000000000..7921eaab84f
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.umldi</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..a40cadb0e03
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.umldi;singleton:=true
+Bundle-Version: 0.1.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.eclipse.papyrus.umldi,
+ org.eclipse.papyrus.umldi.impl,
+ org.eclipse.papyrus.umldi.util
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.xmi;visibility:=reexport,
+ org.eclipse.papyrus.dd;visibility:=reexport,
+ org.eclipse.uml2.types;visibility:=reexport,
+ org.eclipse.uml2.uml;visibility:=reexport,
+ org.eclipse.uml2.common;visibility:=reexport
+Bundle-ActivationPolicy: lazy
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/build.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/build.properties
new file mode 100644
index 00000000000..6bffa411ef6
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/build.properties
@@ -0,0 +1,18 @@
+# Copyright (c) 2014 CEA LIST.
+#  
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#  
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+bin.includes = .,\
+               model/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src/
+output.. = bin/
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.di b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.di
new file mode 100644
index 00000000000..fe0800dc64e
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.di
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList>
+    <availablePage>
+      <emfPageIdentifier href="UMLDI.notation#_-tcaIPp3EeOzRJ7_zNC4UA"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="UMLDI.notation#_eqyvEP8vEeObup8tdlL4zw"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="UMLDI.notation#_yGSecP8vEeObup8tdlL4zw"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="UMLDI.notation#_zh2dgP8vEeObup8tdlL4zw"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="UMLDI.notation#_-tcaIPp3EeOzRJ7_zNC4UA"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="UMLDI.notation#_eqyvEP8vEeObup8tdlL4zw"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="UMLDI.notation#_yGSecP8vEeObup8tdlL4zw"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="UMLDI.notation#_zh2dgP8vEeObup8tdlL4zw"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.ecore b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.ecore
new file mode 100644
index 00000000000..b9010a13140
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.ecore
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="umldi" nsURI="http://www.omg.org/spec/UML/20131001/UMLDI" nsPrefix="umldi">
+  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
+    <details key="validationDelegates" value="http://www.eclipse.org/emf/2002/Ecore/OCL"/>
+  </eAnnotations>
+  <eClassifiers xsi:type="ecore:EClass" name="UmlDiagram" eSuperTypes="#//UmlShape ../../org.eclipse.papyrus.dd/model/DI.ecore#//Diagram">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The most general class for UML diagrams."/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UmlShape" eSuperTypes="#//UmlDiagramElement ../../org.eclipse.papyrus.dd/model/DI.ecore#//Shape">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The most general class for UML diagram elements that are not rendered as lines."/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UmlDiagramElement" abstract="true" eSuperTypes="../../org.eclipse.papyrus.dd/model/DI.ecore#//DiagramElement">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The most general class for UML diagram interchange."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="umlModelElement" upperBound="-1"
+        eType="ecore:EClass ../../org.eclipse.uml2.uml/model/UML.ecore#//Element">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Restricts UMLDiagramElements to show UML Elements, rather than other language elements. "/>
+      </eAnnotations>
+      <eAnnotations source="subsets" references="../../org.eclipse.papyrus.dd/model/DI.ecore#//DiagramElement/modelElement"/>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sharedUmlStyle" ordered="false"
+        eType="#//UmlStyle">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Restricts shared styles to UMLStyles."/>
+      </eAnnotations>
+      <eAnnotations source="subsets" references="../../org.eclipse.papyrus.dd/model/DI.ecore#//DiagramElement/sharedStyle"/>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="localUmlStyle" ordered="false"
+        eType="#//UmlStyle" containment="true">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Restricts owned styles to UMLStyles."/>
+      </eAnnotations>
+      <eAnnotations source="subsets" references="../../org.eclipse.papyrus.dd/model/DI.ecore#//DiagramElement/localStyle"/>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="owningUmlDiagramElement"
+        ordered="false" eType="#//UmlDiagramElement" eOpposite="#//UmlDiagramElement/ownedUmlDiagramElement">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Restricts UMLDiagramElements to be owned by only UMLDiagramElements."/>
+      </eAnnotations>
+      <eAnnotations source="subsets" references="../../org.eclipse.papyrus.dd/model/DI.ecore#//DiagramElement/owningDiagramElement"/>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedUmlDiagramElement"
+        upperBound="-1" eType="#//UmlDiagramElement" containment="true" eOpposite="#//UmlDiagramElement/owningUmlDiagramElement">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Restricts UMLDiagramElements to own only UMLDiagramElements."/>
+      </eAnnotations>
+      <eAnnotations source="subsets" references="../../org.eclipse.papyrus.dd/model/DI.ecore#//DiagramElement/ownedDiagramElement"/>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="targetUmlEdge" upperBound="-1"
+        eType="#//UmlEdge" eOpposite="#//UmlEdge/targetUmlDiagramElement">
+      <eAnnotations source="subsets" references="../../org.eclipse.papyrus.dd/model/DI.ecore#//DiagramElement/targetEdge"/>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceUmlEdge" upperBound="-1"
+        eType="#//UmlEdge" eOpposite="#//UmlEdge/sourceUmlDiagramElement">
+      <eAnnotations source="subsets" references="../../org.eclipse.papyrus.dd/model/DI.ecore#//DiagramElement/sourceEdge"/>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UmlStyle" eSuperTypes="../../org.eclipse.papyrus.dd/model/DI.ecore#//Style">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The most general class for Styles in UML."/>
+    </eAnnotations>
+    <eOperations name="fontsizePositive" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL">
+        <details key="body" value="fontSize > 0"/>
+      </eAnnotations>
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="fontSize must be greater than zero."/>
+      </eAnnotations>
+      <eParameters name="diagnostics" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDiagnosticChain">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The chain of diagnostics to which problems are to be appended."/>
+        </eAnnotations>
+      </eParameters>
+      <eParameters name="context">
+        <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+          <details key="documentation" value="The cache of context-specific information."/>
+        </eAnnotations>
+        <eGenericType eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EMap">
+          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+          <eTypeArguments eClassifier="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+        </eGenericType>
+      </eParameters>
+    </eOperations>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontName" ordered="false"
+        eType="ecore:EDataType ../../org.eclipse.papyrus.dd/model/DC.ecore#//String">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Name of a font used to render strings."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fontSize" ordered="false"
+        eType="ecore:EDataType ../../org.eclipse.papyrus.dd/model/DC.ecore#//Real">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Size of a font for rendering strings, given in typographical points."/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UmlEdge" eSuperTypes="#//UmlDiagramElement ../../org.eclipse.papyrus.dd/model/DI.ecore#//Edge">
+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+      <details key="documentation" value="The most general class for UML diagram elements that are rendered as lines."/>
+    </eAnnotations>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceUmlDiagramElement"
+        ordered="false" lowerBound="1" eType="#//UmlDiagramElement" eOpposite="#//UmlDiagramElement/sourceUmlEdge">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Restricts the sources of UMLEdges to UMLDiagramElements."/>
+      </eAnnotations>
+      <eAnnotations source="subsets" references="../../org.eclipse.papyrus.dd/model/DI.ecore#//Edge/sourceDiagramElement"/>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="targetUmlDiagramElement"
+        ordered="false" lowerBound="1" eType="#//UmlDiagramElement" eOpposite="#//UmlDiagramElement/targetUmlEdge">
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="documentation" value="Restricts the targets of UMLEdges to UMLDiagramElements."/>
+      </eAnnotations>
+      <eAnnotations source="subsets" references="../../org.eclipse.papyrus.dd/model/DI.ecore#//Edge/targetDiagramElement"/>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UmlCompartment" eSuperTypes="#//UmlShape">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" ordered="false" lowerBound="1"
+        eType="#//UmlCompartmentKind"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="UmlCompartmentKind">
+    <eLiterals name="attributes"/>
+    <eLiterals name="operations" value="1"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="UmlLabel" eSuperTypes="#//UmlShape">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" ordered="false" lowerBound="1"
+        eType="#//UmlLabelKind"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="UmlLabelKind">
+    <eLiterals name="name"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.genmodel b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.genmodel
new file mode 100644
index 00000000000..86d8fb042ae
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.genmodel
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:genmodel="http://www.eclipse.org/uml2/2.2.0/GenModel"
+    copyrightText="Copyright (c) 2014 CEA LIST.&#xA; &#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA; &#xD;&#xA;Contributors:&#xD;&#xA; CEA LIST - Initial API and implementation"
+    modelDirectory="/org.eclipse.papyrus.umldi/src" creationSubmenus="true" modelPluginID="org.eclipse.papyrus.umldi"
+    modelName="UMLDI" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    importerID="org.eclipse.uml2.uml.ecore.importer" complianceLevel="7.0" copyrightFields="false"
+    colorProviders="true" fontProviders="true" usedGenPackages="../../org.eclipse.papyrus.dd/model/DC.genmodel#//dc ../../org.eclipse.papyrus.dd/model/DI.genmodel#//di ../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.uml2.types/model/Types.genmodel#//types ../../org.eclipse.uml2.uml/model/UML.genmodel#//uml"
+    operationReflection="true" importOrganizing="true">
+  <genAnnotations source="http://www.eclipse.org/emf/2002/GenModel/importer/org.eclipse.uml2.uml.ecore.importer">
+    <details key="ECORE_TAGGED_VALUES" value="PROCESS"/>
+    <details key="UNION_PROPERTIES" value="PROCESS"/>
+    <details key="DUPLICATE_FEATURES" value="PROCESS"/>
+    <details key="SUBSETTING_PROPERTIES" value="PROCESS"/>
+    <details key="VALIDATION_DELEGATES" value="PROCESS"/>
+    <details key="COMMENTS" value="PROCESS"/>
+    <details key="DUPLICATE_FEATURE_INHERITANCE" value="PROCESS"/>
+    <details key="DUPLICATE_OPERATIONS" value="PROCESS"/>
+    <details key="INVARIANT_CONSTRAINTS" value="PROCESS"/>
+    <details key="REDEFINING_PROPERTIES" value="PROCESS"/>
+    <details key="ANNOTATION_DETAILS" value="PROCESS"/>
+    <details key="DUPLICATE_OPERATION_INHERITANCE" value="PROCESS"/>
+    <details key="REDEFINING_OPERATIONS" value="PROCESS"/>
+    <details key="INVOCATION_DELEGATES" value="PROCESS"/>
+    <details key="DERIVED_FEATURES" value="PROCESS"/>
+    <details key="OPERATION_BODIES" value="PROCESS"/>
+    <details key="CAMEL_CASE_NAMES" value="PROCESS"/>
+    <details key="SUPER_CLASS_ORDER" value="PROCESS"/>
+  </genAnnotations>
+  <foreignModel>UMLDI.uml</foreignModel>
+  <genPackages xsi:type="genmodel:GenPackage" prefix="UMLDI" basePackage="org.eclipse.papyrus"
+      resource="XML" disposableProviderFactory="true" ecorePackage="UMLDI.ecore#/">
+    <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="UMLDI.ecore#//UmlCompartmentKind">
+      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="UMLDI.ecore#//UmlCompartmentKind/attributes"/>
+      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="UMLDI.ecore#//UmlCompartmentKind/operations"/>
+    </genEnums>
+    <genEnums xsi:type="genmodel:GenEnum" typeSafeEnumCompatible="false" ecoreEnum="UMLDI.ecore#//UmlLabelKind">
+      <genEnumLiterals xsi:type="genmodel:GenEnumLiteral" ecoreEnumLiteral="UMLDI.ecore#//UmlLabelKind/name"/>
+    </genEnums>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLDI.ecore#//UmlDiagram"/>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLDI.ecore#//UmlShape"/>
+    <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="UMLDI.ecore#//UmlDiagramElement">
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference UMLDI.ecore#//UmlDiagramElement/umlModelElement"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference UMLDI.ecore#//UmlDiagramElement/sharedUmlStyle"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+          createChild="true" ecoreFeature="ecore:EReference UMLDI.ecore#//UmlDiagramElement/localUmlStyle"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" notify="false" createChild="false"
+          ecoreFeature="ecore:EReference UMLDI.ecore#//UmlDiagramElement/owningUmlDiagramElement"/>
+      <genFeatures xsi:type="genmodel:GenFeature" property="None" children="true"
+          createChild="true" ecoreFeature="ecore:EReference UMLDI.ecore#//UmlDiagramElement/ownedUmlDiagramElement"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference UMLDI.ecore#//UmlDiagramElement/targetUmlEdge"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference UMLDI.ecore#//UmlDiagramElement/sourceUmlEdge"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLDI.ecore#//UmlStyle">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UMLDI.ecore#//UmlStyle/fontName"/>
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UMLDI.ecore#//UmlStyle/fontSize"/>
+      <genOperations xsi:type="genmodel:GenOperation" ecoreOperation="UMLDI.ecore#//UmlStyle/fontsizePositive">
+        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLDI.ecore#//UmlStyle/fontsizePositive/diagnostics"/>
+        <genParameters xsi:type="genmodel:GenParameter" ecoreParameter="UMLDI.ecore#//UmlStyle/fontsizePositive/context"/>
+      </genOperations>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLDI.ecore#//UmlEdge">
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference UMLDI.ecore#//UmlEdge/sourceUmlDiagramElement"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference UMLDI.ecore#//UmlEdge/targetUmlDiagramElement"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLDI.ecore#//UmlCompartment">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UMLDI.ecore#//UmlCompartment/kind"/>
+    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="UMLDI.ecore#//UmlLabel">
+      <genFeatures xsi:type="genmodel:GenFeature" createChild="false" ecoreFeature="ecore:EAttribute UMLDI.ecore#//UmlLabel/kind"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.notation b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.notation
new file mode 100644
index 00000000000..b89559a3acd
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.notation
@@ -0,0 +1,902 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:l2="http://www.eclipse.org/uml2/4.0.0/UML/Profile/L2" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+  <notation:Diagram xmi:id="_-tcaIPp3EeOzRJ7_zNC4UA" type="PapyrusUMLClassDiagram" name="UMLDiagramElement" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_jZYAIP5VEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jZgjAP5VEeObup8tdlL4zw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jZgjAf5VEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jZhKEP5VEeObup8tdlL4zw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jZhKEf5VEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jZhKEv5VEeObup8tdlL4zw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jZhKE_5VEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jZjmUP5VEeObup8tdlL4zw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jZn3wP5VEeObup8tdlL4zw" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jZn3wf5VEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_jZn3wv5VEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_jZn3w_5VEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jZn3xP5VEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jZn3xf5VEeObup8tdlL4zw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jZn3xv5VEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_jZn3x_5VEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_jZn3yP5VEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jZn3yf5VEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jZn3yv5VEeObup8tdlL4zw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jZn3y_5VEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_jZn3zP5VEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_jZn3zf5VEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jZn3zv5VEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jdDmQP5VEeObup8tdlL4zw" visible="false" type="AppliedStereotypeCompartement">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jdDmQf5VEeObup8tdlL4zw" showTitle="true"/>
+        <element xmi:type="l2:Metaclass" href="pathmap://UML_METAMODELS/UML.metamodel.uml#_SjhRgKtKEeGF4uwJob34Mw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jdDmQv5VEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jdGpkP5VEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jdGpkf5VEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jdGpkv5VEeObup8tdlL4zw"/>
+      </children>
+      <element xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jZYAIf5VEeObup8tdlL4zw" x="560" y="130" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_jdSPwP5VEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdSPwv5VEeObup8tdlL4zw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdSPw_5VEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdS20P5VEeObup8tdlL4zw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdS20f5VEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_jdS20v5VEeObup8tdlL4zw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_jdS20_5VEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jdS21P5VEeObup8tdlL4zw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jdS21f5VEeObup8tdlL4zw" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jdS21v5VEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_jdS21_5VEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_jdS22P5VEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jdS22f5VEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jdS22v5VEeObup8tdlL4zw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jdS22_5VEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_jdS23P5VEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_jdS23f5VEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jdS23v5VEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jdS23_5VEeObup8tdlL4zw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jdS24P5VEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_jdS24f5VEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_jdS24v5VEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jdS24_5VEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_jdayoP5VEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_jdayof5VEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jdayov5VEeObup8tdlL4zw"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#UMLDiagramElement"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_jdSPwf5VEeObup8tdlL4zw" x="200" y="130" width="138" height="210"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_8ckdIP8sEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8clEMP8sEeObup8tdlL4zw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8clEMf8sEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8clEMv8sEeObup8tdlL4zw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8clEM_8sEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_8clENP8sEeObup8tdlL4zw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_8clENf8sEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8clENv8sEeObup8tdlL4zw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8clEN_8sEeObup8tdlL4zw" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_VWsRAP8wEeObup8tdlL4zw" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="UMLDI.uml#UMLStyle-fontName"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_VWsRAf8wEeObup8tdlL4zw" x="51" y="12"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_VW2pEP8wEeObup8tdlL4zw" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="UMLDI.uml#UMLStyle-fontSize"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_VW2pEf8wEeObup8tdlL4zw" x="51" y="12"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8clEOP8sEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8clEOf8sEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8clEOv8sEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8clEO_8sEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8clrQP8sEeObup8tdlL4zw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8clrQf8sEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8clrQv8sEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8clrQ_8sEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8clrRP8sEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8clrRf8sEeObup8tdlL4zw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8clrRv8sEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_8clrR_8sEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_8clrSP8sEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8clrSf8sEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_8cvcQP8sEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_8cvcQf8sEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8cvcQv8sEeObup8tdlL4zw"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#UMLStyle"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_8ckdIf8sEeObup8tdlL4zw" x="652" y="230"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_zp1KQP8uEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zp1xUP8uEeObup8tdlL4zw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zp1xUf8uEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zp1xUv8uEeObup8tdlL4zw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zp1xU_8uEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_zp1xVP8uEeObup8tdlL4zw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_zp1xVf8uEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_zp2YYP8uEeObup8tdlL4zw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_zp2YYf8uEeObup8tdlL4zw" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_zp2YYv8uEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_zp2YY_8uEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_zp2YZP8uEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zp2YZf8uEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_zp2YZv8uEeObup8tdlL4zw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_zp2YZ_8uEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_zp2YaP8uEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_zp2Yaf8uEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zp2Yav8uEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_zp2Ya_8uEeObup8tdlL4zw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_zp2YbP8uEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_zp2Ybf8uEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_zp2Ybv8uEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zp2Yb_8uEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_zp9tIP8uEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_zp9tIf8uEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zp9tIv8uEeObup8tdlL4zw"/>
+      </children>
+      <element xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.dd/model/DI.uml#Style"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zp1KQf8uEeObup8tdlL4zw" x="680" y="130" height="37"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_fUcUwAkOEeSM9dpvq2CG1g" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fUexAAkOEeSM9dpvq2CG1g" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fUexAQkOEeSM9dpvq2CG1g" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fUfYEAkOEeSM9dpvq2CG1g" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fUfYEQkOEeSM9dpvq2CG1g" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_fUfYEgkOEeSM9dpvq2CG1g" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_fUfYEwkOEeSM9dpvq2CG1g" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_fUfYFAkOEeSM9dpvq2CG1g" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_fUfYFQkOEeSM9dpvq2CG1g" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_fUfYFgkOEeSM9dpvq2CG1g"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_fUfYFwkOEeSM9dpvq2CG1g"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_fUfYGAkOEeSM9dpvq2CG1g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fUfYGQkOEeSM9dpvq2CG1g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_fUfYGgkOEeSM9dpvq2CG1g" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_fUfYGwkOEeSM9dpvq2CG1g"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_fUfYHAkOEeSM9dpvq2CG1g"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_fUfYHQkOEeSM9dpvq2CG1g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fUfYHgkOEeSM9dpvq2CG1g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_fUfYHwkOEeSM9dpvq2CG1g" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_fUfYIAkOEeSM9dpvq2CG1g"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_fUfYIQkOEeSM9dpvq2CG1g"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_fUf_IAkOEeSM9dpvq2CG1g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fUf_IQkOEeSM9dpvq2CG1g"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_fUv2wAkOEeSM9dpvq2CG1g" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_fUv2wQkOEeSM9dpvq2CG1g"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fUv2wgkOEeSM9dpvq2CG1g"/>
+      </children>
+      <element xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.dd/model/DI.uml#DiagramElement"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fUcUwQkOEeSM9dpvq2CG1g" x="220" y="20" height="41"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_-tcaIfp3EeOzRJ7_zNC4UA"/>
+    <element xmi:type="uml:Package" href="UMLDI.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_jdymEP5VEeObup8tdlL4zw" type="4001" source="_jZYAIP5VEeObup8tdlL4zw" target="_jdSPwP5VEeObup8tdlL4zw" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_jdz0MP5VEeObup8tdlL4zw" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jdz0Mf5VEeObup8tdlL4zw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jdz0Mv5VEeObup8tdlL4zw" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jdz0M_5VEeObup8tdlL4zw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jdz0NP5VEeObup8tdlL4zw" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jdz0Nf5VEeObup8tdlL4zw" x="45" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jdz0Nv5VEeObup8tdlL4zw" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jd0bQP5VEeObup8tdlL4zw" x="-45" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jd0bQf5VEeObup8tdlL4zw" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jd0bQv5VEeObup8tdlL4zw" x="1" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_jd0bQ_5VEeObup8tdlL4zw" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_jd0bRP5VEeObup8tdlL4zw" x="7" y="-6"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_jdymEf5VEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="UMLDI.uml#A_UMLDiagramElement_modelElement_umlDiagramElement"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_jdymEv5VEeObup8tdlL4zw" points="[-52, -21, 357, 20]$[-324, -21, 85, 20]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CFIBEP8tEeObup8tdlL4zw" id="(0.52,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CFIBEf8tEeObup8tdlL4zw" id="(0.2543859649122807,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_8cztsP8sEeObup8tdlL4zw" type="4001" source="_8ckdIP8sEeObup8tdlL4zw" target="_jdSPwP5VEeObup8tdlL4zw" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_8c0UwP8sEeObup8tdlL4zw" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8c0Uwf8sEeObup8tdlL4zw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8c0Uwv8sEeObup8tdlL4zw" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8c0Uw_8sEeObup8tdlL4zw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8c0UxP8sEeObup8tdlL4zw" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8c0Uxf8sEeObup8tdlL4zw" x="26" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8c0Uxv8sEeObup8tdlL4zw" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8c0Ux_8sEeObup8tdlL4zw" x="-33" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8c070P8sEeObup8tdlL4zw" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8c070f8sEeObup8tdlL4zw" x="22" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_8c070v8sEeObup8tdlL4zw" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_8c070_8sEeObup8tdlL4zw" x="8" y="-6"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_8cztsf8sEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="UMLDI.uml#A_UMLDiagramElement_localStyle_styledElement"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_8cztsv8sEeObup8tdlL4zw" points="[-48, -20, 367, 180]$[-360, -20, 55, 180]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CFIoIP8tEeObup8tdlL4zw" id="(0.33,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CFJPMP8tEeObup8tdlL4zw" id="(0.5175438596491229,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_83xLYP8sEeObup8tdlL4zw" type="4001" source="_8ckdIP8sEeObup8tdlL4zw" target="_jdSPwP5VEeObup8tdlL4zw" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_83xycP8sEeObup8tdlL4zw" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_83xycf8sEeObup8tdlL4zw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_83xycv8sEeObup8tdlL4zw" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_83xyc_8sEeObup8tdlL4zw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_83xydP8sEeObup8tdlL4zw" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_83xydf8sEeObup8tdlL4zw" x="21" y="-6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_83xydv8sEeObup8tdlL4zw" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_83yZgP8sEeObup8tdlL4zw" x="-33" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_83yZgf8sEeObup8tdlL4zw" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_83yZgv8sEeObup8tdlL4zw" x="2" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_83yZg_8sEeObup8tdlL4zw" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_83yZhP8sEeObup8tdlL4zw" x="15" y="-6"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_83xLYf8sEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="UMLDI.uml#A_UMLDiagramElement_sharedStyle_styledElement"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_83xLYv8sEeObup8tdlL4zw" points="[-97, -80, 340, 120]$[-409, -80, 28, 120]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CFJ2QP8tEeObup8tdlL4zw" id="(0.66,1.0)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_CFJ2Qf8tEeObup8tdlL4zw" id="(0.7543859649122807,0.0)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_9J75cP8sEeObup8tdlL4zw" type="4001" source="_jdSPwP5VEeObup8tdlL4zw" target="_jdSPwP5VEeObup8tdlL4zw" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_9J8ggP8sEeObup8tdlL4zw" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9J8ggf8sEeObup8tdlL4zw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9J8ggv8sEeObup8tdlL4zw" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9J8gg_8sEeObup8tdlL4zw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9J9HkP8sEeObup8tdlL4zw" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9J9Hkf8sEeObup8tdlL4zw" x="96" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9J9Hkv8sEeObup8tdlL4zw" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9J9Hk_8sEeObup8tdlL4zw" x="-64" y="16"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9J9HlP8sEeObup8tdlL4zw" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9J9Hlf8sEeObup8tdlL4zw" x="6" y="14"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_9J9Hlv8sEeObup8tdlL4zw" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_9J9Hl_8sEeObup8tdlL4zw" x="-44" y="-4"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_9J75cf8sEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="UMLDI.uml#A_UMLDiagramElement_ownedElement_owningElement"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9J75cv8sEeObup8tdlL4zw" points="[-29, -105, -29, -105]$[-29, -135, -29, -135]$[-129, -135, -129, -135]$[-129, -65, -129, -65]$[-69, -65, -69, -65]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_zqCloP8uEeObup8tdlL4zw" type="4002" source="_8ckdIP8sEeObup8tdlL4zw" target="_zp1KQP8uEeObup8tdlL4zw" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_zqDMsP8uEeObup8tdlL4zw" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zqDMsf8uEeObup8tdlL4zw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_zqClof8uEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#UMLStyle-_generalization.0"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zqClov8uEeObup8tdlL4zw" points="[-50, -18, 600, 212]$[-650, -230, 0, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_fVF1AAkOEeSM9dpvq2CG1g" type="4002" source="_jdSPwP5VEeObup8tdlL4zw" target="_fUcUwAkOEeSM9dpvq2CG1g" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_fVGcEAkOEeSM9dpvq2CG1g" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_fVHDIAkOEeSM9dpvq2CG1g" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_fVF1AQkOEeSM9dpvq2CG1g" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#UMLDiagramElement-_generalization.0"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fVF1AgkOEeSM9dpvq2CG1g" points="[-69, -61, 200, 174]$[-269, -235, 0, 0]"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_eqyvEP8vEeObup8tdlL4zw" type="PapyrusUMLClassDiagram" name="UMLDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_gGDzMP8vEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gGEaQP8vEeObup8tdlL4zw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gGEaQf8vEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gGEaQv8vEeObup8tdlL4zw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gGEaQ_8vEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gGEaRP8vEeObup8tdlL4zw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gGEaRf8vEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gGEaRv8vEeObup8tdlL4zw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gGEaR_8vEeObup8tdlL4zw" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gGEaSP8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gGEaSf8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gGEaSv8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGEaS_8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gGEaTP8vEeObup8tdlL4zw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gGEaTf8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gGEaTv8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gGEaT_8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGEaUP8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gGEaUf8vEeObup8tdlL4zw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gGEaUv8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gGEaU_8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gGEaVP8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGEaVf8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gGMWEP8vEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gGMWEf8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGMWEv8vEeObup8tdlL4zw"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#UMLDiagram"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGDzMf8vEeObup8tdlL4zw" x="185" y="99" height="62"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_gGPZYP8vEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gGQAcP8vEeObup8tdlL4zw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gGQAcf8vEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gGQAcv8vEeObup8tdlL4zw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gGQAc_8vEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_gGQAdP8vEeObup8tdlL4zw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_gGQAdf8vEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_gGQAdv8vEeObup8tdlL4zw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gGQAd_8vEeObup8tdlL4zw" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gGQAeP8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gGQAef8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gGQAev8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGQAe_8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gGQAfP8vEeObup8tdlL4zw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gGQAff8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gGQAfv8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gGQAf_8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGQAgP8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gGQngP8vEeObup8tdlL4zw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gGQngf8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_gGQngv8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_gGQng_8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGQnhP8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_gGXVMP8vEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_gGXVMf8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGXVMv8vEeObup8tdlL4zw"/>
+      </children>
+      <element xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.dd/model/DI.uml#Diagram"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gGPZYf8vEeObup8tdlL4zw" x="185" y="18" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_FUooYAbgEeSMUp1tRQHOJw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FUooYQbgEeSMUp1tRQHOJw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FUooYgbgEeSMUp1tRQHOJw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FUooYwbgEeSMUp1tRQHOJw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FUooZAbgEeSMUp1tRQHOJw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_FUooZQbgEeSMUp1tRQHOJw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_FUooZgbgEeSMUp1tRQHOJw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_FUooZwbgEeSMUp1tRQHOJw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FUooaAbgEeSMUp1tRQHOJw" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_FUooaQbgEeSMUp1tRQHOJw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_FUooagbgEeSMUp1tRQHOJw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_FUooawbgEeSMUp1tRQHOJw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUoobAbgEeSMUp1tRQHOJw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FUoobQbgEeSMUp1tRQHOJw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_FUoobgbgEeSMUp1tRQHOJw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_FUoobwbgEeSMUp1tRQHOJw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_FUoocAbgEeSMUp1tRQHOJw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUoocQbgEeSMUp1tRQHOJw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FUoocgbgEeSMUp1tRQHOJw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_FUoocwbgEeSMUp1tRQHOJw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_FUoodAbgEeSMUp1tRQHOJw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_FUoodQbgEeSMUp1tRQHOJw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUoodgbgEeSMUp1tRQHOJw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_FUoodwbgEeSMUp1tRQHOJw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_FUooeAbgEeSMUp1tRQHOJw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUooeQbgEeSMUp1tRQHOJw"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#UMLShape"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_FUooegbgEeSMUp1tRQHOJw" x="40" y="19" height="41"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_eqyvEf8vEeObup8tdlL4zw"/>
+    <element xmi:type="uml:Package" href="UMLDI.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_gGa_kP8vEeObup8tdlL4zw" type="4002" source="_gGDzMP8vEeObup8tdlL4zw" target="_gGPZYP8vEeObup8tdlL4zw" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_gGbmoP8vEeObup8tdlL4zw" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gGbmof8vEeObup8tdlL4zw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_gGa_kf8vEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#UMLDiagram-_generalization.0"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gGa_kv8vEeObup8tdlL4zw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_gYlGkP8vEeObup8tdlL4zw" type="4002" source="_gGDzMP8vEeObup8tdlL4zw" target="_FUooYAbgEeSMUp1tRQHOJw" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_gYltoP8vEeObup8tdlL4zw" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_gYltof8vEeObup8tdlL4zw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_gYlGkf8vEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#UMLDiagram-_generalization.2"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_gYlGkv8vEeObup8tdlL4zw" points="[-36, -50, 244, 342]$[-280, -392, 0, 0]"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IuECUAbgEeSMUp1tRQHOJw" id="(0.8,1.0)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_yGSecP8vEeObup8tdlL4zw" type="PapyrusUMLClassDiagram" name="UMLShape" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_-rzNcP8vEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-rz0gP8vEeObup8tdlL4zw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-rz0gf8vEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-rz0gv8vEeObup8tdlL4zw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-rz0g_8vEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-rz0hP8vEeObup8tdlL4zw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-rz0hf8vEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-rz0hv8vEeObup8tdlL4zw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-rz0h_8vEeObup8tdlL4zw" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-rz0iP8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-rz0if8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-rz0iv8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-rz0i_8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-r0bkP8vEeObup8tdlL4zw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-r0bkf8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-r0bkv8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-r0bk_8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-r0blP8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-r0blf8vEeObup8tdlL4zw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-r0blv8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-r0bl_8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-r0bmP8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-r0bmf8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-r7wUP8vEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-r7wUf8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-r7wUv8vEeObup8tdlL4zw"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#UMLShape"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-rzNcf8vEeObup8tdlL4zw" x="160" y="100" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_-r-zoP8vEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-r-zov8vEeObup8tdlL4zw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-r-zo_8vEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-r-zpP8vEeObup8tdlL4zw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-r-zpf8vEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_-r_asP8vEeObup8tdlL4zw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_-r_asf8vEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_-r_asv8vEeObup8tdlL4zw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-r_as_8vEeObup8tdlL4zw" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-r_atP8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-r_atf8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-r_atv8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-r_at_8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-r_auP8vEeObup8tdlL4zw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-r_auf8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-r_auv8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-r_au_8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-r_avP8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-r_avf8vEeObup8tdlL4zw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-r_avv8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_-r_av_8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_-r_awP8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-r_awf8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_-sGvcP8vEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_-sGvcf8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-sGvcv8vEeObup8tdlL4zw"/>
+      </children>
+      <element xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.dd/model/DI.uml#Shape"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-r-zof8vEeObup8tdlL4zw" x="220" y="19" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__CqOQP8vEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__CqOQv8vEeObup8tdlL4zw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__CqOQ_8vEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__CqORP8vEeObup8tdlL4zw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__CqORf8vEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__Cq1UP8vEeObup8tdlL4zw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__Cq1Uf8vEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="__Cq1Uv8vEeObup8tdlL4zw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__Cq1U_8vEeObup8tdlL4zw" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__Cq1VP8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__Cq1Vf8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__Cq1Vv8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Cq1V_8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__Cq1WP8vEeObup8tdlL4zw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__Cq1Wf8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__Cq1Wv8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__Cq1W_8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Cq1XP8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__Cq1Xf8vEeObup8tdlL4zw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__Cq1Xv8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__Cq1X_8vEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__Cq1YP8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__Cq1Yf8vEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__CyKEP8vEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="__CyKEf8vEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__CyKEv8vEeObup8tdlL4zw"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#UMLDiagramElement"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__CqOQf8vEeObup8tdlL4zw" x="60" y="20" width="121" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_bdoekBO_EeSXerk-XJQMGw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bdpFoBO_EeSXerk-XJQMGw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bdpFoRO_EeSXerk-XJQMGw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bdpFohO_EeSXerk-XJQMGw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bdpFoxO_EeSXerk-XJQMGw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_bdpFpBO_EeSXerk-XJQMGw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_bdpFpRO_EeSXerk-XJQMGw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_bdpFphO_EeSXerk-XJQMGw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_bdpFpxO_EeSXerk-XJQMGw" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_yCyREBPAEeSXerk-XJQMGw" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="UMLDI.uml#_yCxC8BPAEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_yCyRERPAEeSXerk-XJQMGw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_bdpFqBO_EeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_bdpFqRO_EeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_bdpFqhO_EeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bdpFqxO_EeSXerk-XJQMGw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_bdpFrBO_EeSXerk-XJQMGw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_bdpFrRO_EeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_bdpFrhO_EeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_bdpFrxO_EeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bdpFsBO_EeSXerk-XJQMGw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_bdpssBO_EeSXerk-XJQMGw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_bdpssRO_EeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_bdpsshO_EeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_bdpssxO_EeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bdpstBO_EeSXerk-XJQMGw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_bd158BO_EeSXerk-XJQMGw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_bd158RO_EeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bd158hO_EeSXerk-XJQMGw"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#_bdk0MBO_EeSXerk-XJQMGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_bdoekRO_EeSXerk-XJQMGw" x="20" y="220" width="201" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_RqrhUBPAEeSXerk-XJQMGw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RqsIYBPAEeSXerk-XJQMGw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RqsIYRPAEeSXerk-XJQMGw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RqsIYhPAEeSXerk-XJQMGw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RqsIYxPAEeSXerk-XJQMGw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_RqsIZBPAEeSXerk-XJQMGw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_RqsIZRPAEeSXerk-XJQMGw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_RqsIZhPAEeSXerk-XJQMGw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_RqsIZxPAEeSXerk-XJQMGw" type="7017">
+        <children xmi:type="notation:Shape" xmi:id="_v1Ts4BPAEeSXerk-XJQMGw" type="3012" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:Property" href="UMLDI.uml#_v1SewBPAEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_v1Ts4RPAEeSXerk-XJQMGw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_RqsIaBPAEeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_RqsIaRPAEeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_RqsIahPAEeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqsIaxPAEeSXerk-XJQMGw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_RqsIbBPAEeSXerk-XJQMGw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_RqsIbRPAEeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_RqsIbhPAEeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_RqsIbxPAEeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqsIcBPAEeSXerk-XJQMGw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_RqsvcBPAEeSXerk-XJQMGw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_RqsvcRPAEeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_RqsvchPAEeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_RqsvcxPAEeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqsvdBPAEeSXerk-XJQMGw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_RqzdIBPAEeSXerk-XJQMGw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_RqzdIRPAEeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqzdIhPAEeSXerk-XJQMGw"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#_RqpFEBPAEeSXerk-XJQMGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RqrhURPAEeSXerk-XJQMGw" x="251" y="220" height="61"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_dtlSgBPAEeSXerk-XJQMGw" type="2006" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dtl5kBPAEeSXerk-XJQMGw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dtl5kRPAEeSXerk-XJQMGw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dtl5khPAEeSXerk-XJQMGw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dtl5kxPAEeSXerk-XJQMGw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_dtl5lBPAEeSXerk-XJQMGw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_dtl5lRPAEeSXerk-XJQMGw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_dtl5lhPAEeSXerk-XJQMGw" type="5023"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dtl5lxPAEeSXerk-XJQMGw" type="7015">
+        <children xmi:type="notation:Shape" xmi:id="_fytL8BPAEeSXerk-XJQMGw" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="UMLDI.uml#_fyphkBPAEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_fytL8RPAEeSXerk-XJQMGw"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_hUwNgBPAEeSXerk-XJQMGw" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="UMLDI.uml#_hUu_YBPAEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_hUwNgRPAEeSXerk-XJQMGw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dtl5mBPAEeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_dtl5mRPAEeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_dtl5mhPAEeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtl5mxPAEeSXerk-XJQMGw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_dtqyEBPAEeSXerk-XJQMGw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_dtqyERPAEeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtqyEhPAEeSXerk-XJQMGw"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="UMLDI.uml#_dtjdUBPAEeSXerk-XJQMGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dtlSgRPAEeSXerk-XJQMGw" x="420" y="20" width="141"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_mkwukBPAEeSXerk-XJQMGw" type="2006" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mkxVoBPAEeSXerk-XJQMGw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mkxVoRPAEeSXerk-XJQMGw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mkxVohPAEeSXerk-XJQMGw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mkxVoxPAEeSXerk-XJQMGw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_mkxVpBPAEeSXerk-XJQMGw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_mkxVpRPAEeSXerk-XJQMGw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_mkxVphPAEeSXerk-XJQMGw" type="5023"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mkxVpxPAEeSXerk-XJQMGw" type="7015">
+        <children xmi:type="notation:Shape" xmi:id="_rrzg4BPAEeSXerk-XJQMGw" type="3017" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+          <element xmi:type="uml:EnumerationLiteral" href="UMLDI.uml#_rrySwBPAEeSXerk-XJQMGw"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rrzg4RPAEeSXerk-XJQMGw"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mkxVqBPAEeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_mkxVqRPAEeSXerk-XJQMGw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_mkxVqhPAEeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mkxVqxPAEeSXerk-XJQMGw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_mk1nEBPAEeSXerk-XJQMGw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_mk1nERPAEeSXerk-XJQMGw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mk1nEhPAEeSXerk-XJQMGw"/>
+      </children>
+      <element xmi:type="uml:Enumeration" href="UMLDI.uml#_mku5YBPAEeSXerk-XJQMGw"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_mkwukRPAEeSXerk-XJQMGw" x="440" y="160"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_yGSecf8vEeObup8tdlL4zw"/>
+    <element xmi:type="uml:Package" href="UMLDI.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_-sKZ0P8vEeObup8tdlL4zw" type="4002" source="_-rzNcP8vEeObup8tdlL4zw" target="_-r-zoP8vEeObup8tdlL4zw" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_-sKZ0_8vEeObup8tdlL4zw" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_-sKZ1P8vEeObup8tdlL4zw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_-sKZ0f8vEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#UMLShape-_generalization.0"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-sKZ0v8vEeObup8tdlL4zw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="__C10cP8vEeObup8tdlL4zw" type="4002" source="_-rzNcP8vEeObup8tdlL4zw" target="__CqOQP8vEeObup8tdlL4zw" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="__C2bgP8vEeObup8tdlL4zw" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__C2bgf8vEeObup8tdlL4zw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__C10cf8vEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#UMLShape-_generalization.1"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__C10cv8vEeObup8tdlL4zw" points="[-47, -50, 181, 193]$[-228, -243, 0, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_zI4L4BO_EeSXerk-XJQMGw" type="4002" source="_bdoekBO_EeSXerk-XJQMGw" target="_-rzNcP8vEeObup8tdlL4zw" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_zI4y8BO_EeSXerk-XJQMGw" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_zI4y8RO_EeSXerk-XJQMGw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_zI4L4RO_EeSXerk-XJQMGw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#_zIr-oBO_EeSXerk-XJQMGw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zI4L4hO_EeSXerk-XJQMGw" points="[-40, -30, 81, 61]$[-100, -93, 21, -2]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_XTTWsBPAEeSXerk-XJQMGw" type="4002" source="_RqrhUBPAEeSXerk-XJQMGw" target="_-rzNcP8vEeObup8tdlL4zw" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_XTT9wBPAEeSXerk-XJQMGw" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_XTT9wRPAEeSXerk-XJQMGw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_XTTWsRPAEeSXerk-XJQMGw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#_XTSIkBPAEeSXerk-XJQMGw"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_XTTWshPAEeSXerk-XJQMGw" points="[-44, -30, 136, 90]$[-130, -113, 50, 7]"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_zh2dgP8vEeObup8tdlL4zw" type="PapyrusUMLClassDiagram" name="UMLEdge" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_qoxukP8wEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qoxukv8wEeObup8tdlL4zw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qoxuk_8wEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qoxulP8wEeObup8tdlL4zw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qoxulf8wEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qoyVoP8wEeObup8tdlL4zw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qoyVof8wEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qoyVov8wEeObup8tdlL4zw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qoyVo_8wEeObup8tdlL4zw" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qoyVpP8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qoyVpf8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qoyVpv8wEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qoyVp_8wEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qoyVqP8wEeObup8tdlL4zw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qoyVqf8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qoyVqv8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qoyVq_8wEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qoyVrP8wEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qoyVrf8wEeObup8tdlL4zw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qoyVrv8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qoyVr_8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qoyVsP8wEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qoyVsf8wEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qo5DUP8wEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qo5DUf8wEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qo5DUv8wEeObup8tdlL4zw"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#UMLEdge"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qoxukf8wEeObup8tdlL4zw" x="440" y="120"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_qo8GoP8wEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qo8tsP8wEeObup8tdlL4zw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qo8tsf8wEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qo8tsv8wEeObup8tdlL4zw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qo8ts_8wEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_qo8ttP8wEeObup8tdlL4zw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_qo8ttf8wEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_qo8ttv8wEeObup8tdlL4zw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qo8tt_8wEeObup8tdlL4zw" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qo8tuP8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qo8tuf8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qo8tuv8wEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qo8tu_8wEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qo8tvP8wEeObup8tdlL4zw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qo8tvf8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qo8tvv8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qo8tv_8wEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qo8twP8wEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qo8twf8wEeObup8tdlL4zw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qo8twv8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_qo8tw_8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_qo8txP8wEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qo8txf8wEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_qpDbYP8wEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_qpDbYf8wEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qpDbYv8wEeObup8tdlL4zw"/>
+      </children>
+      <element xmi:type="uml:Class" href="platform:/resource/org.eclipse.papyrus.dd/model/DI.uml#Edge"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qo8Gof8wEeObup8tdlL4zw" x="440" y="20" height="41"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_rJICkP8wEeObup8tdlL4zw" type="2008" fontName="Lucida Grande" fontHeight="11" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rJICkv8wEeObup8tdlL4zw" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rJICk_8wEeObup8tdlL4zw" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rJIClP8wEeObup8tdlL4zw" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rJIClf8wEeObup8tdlL4zw" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_rJIClv8wEeObup8tdlL4zw" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_rJICl_8wEeObup8tdlL4zw" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_rJIpoP8wEeObup8tdlL4zw" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rJIpof8wEeObup8tdlL4zw" visible="false" type="7017">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rJIpov8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rJIpo_8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rJIppP8wEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJIppf8wEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rJIppv8wEeObup8tdlL4zw" visible="false" type="7018">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rJIpp_8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rJIpqP8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rJIpqf8wEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJIpqv8wEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rJIpq_8wEeObup8tdlL4zw" visible="false" type="7019">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rJIprP8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_rJIprf8wEeObup8tdlL4zw"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_rJIprv8wEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJIpr_8wEeObup8tdlL4zw"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_rJPXUP8wEeObup8tdlL4zw" visible="false" type="compartment_shape_display">
+        <styles xmi:type="notation:TitleStyle" xmi:id="_rJPXUf8wEeObup8tdlL4zw"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJPXUv8wEeObup8tdlL4zw"/>
+      </children>
+      <element xmi:type="uml:Class" href="UMLDI.uml#UMLDiagramElement"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rJICkf8wEeObup8tdlL4zw" x="80" y="20" width="301" height="41"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_zh2dgf8vEeObup8tdlL4zw"/>
+    <element xmi:type="uml:Package" href="UMLDI.uml#_0"/>
+    <edges xmi:type="notation:Connector" xmi:id="_qpHFwP8wEeObup8tdlL4zw" type="4002" source="_qoxukP8wEeObup8tdlL4zw" target="_qo8GoP8wEeObup8tdlL4zw" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_qpHs0P8wEeObup8tdlL4zw" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_qpHs0f8wEeObup8tdlL4zw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_qpHFwf8wEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#UMLEdge-_generalization.0"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_qpHFwv8wEeObup8tdlL4zw" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_rJSaoP8wEeObup8tdlL4zw" type="4002" source="_qoxukP8wEeObup8tdlL4zw" target="_rJICkP8wEeObup8tdlL4zw" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_rJTBsP8wEeObup8tdlL4zw" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_rJTBsf8wEeObup8tdlL4zw" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_rJSaof8wEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Generalization" href="UMLDI.uml#UMLEdge-_generalization.1"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_rJSaov8wEeObup8tdlL4zw" points="[-50, -47, 272, 253]$[-322, -300, 0, 0]"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_rforMAbdEeSMUp1tRQHOJw" id="(0.9302325581395349,0.975609756097561)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_0Osf8P8wEeObup8tdlL4zw" type="4001" source="_rJICkP8wEeObup8tdlL4zw" target="_qoxukP8wEeObup8tdlL4zw" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_0Osf8_8wEeObup8tdlL4zw" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0Osf9P8wEeObup8tdlL4zw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0Osf9f8wEeObup8tdlL4zw" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0OtHAP8wEeObup8tdlL4zw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0OtHAf8wEeObup8tdlL4zw" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0OtHAv8wEeObup8tdlL4zw" x="-38" y="80"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0OtHA_8wEeObup8tdlL4zw" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0OtHBP8wEeObup8tdlL4zw" x="-20" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0OtHBf8wEeObup8tdlL4zw" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0OtHBv8wEeObup8tdlL4zw" x="-18" y="29"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_0OtHB_8wEeObup8tdlL4zw" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_0OtHCP8wEeObup8tdlL4zw" x="21" y="26"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_0Osf8f8wEeObup8tdlL4zw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="UMLDI.uml#A_UMLEdge_source_sourceEdge"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0Osf8v8wEeObup8tdlL4zw" points="[-70, 21, -330, -109]$[-70, 160, -330, 30]$[210, 160, -50, 30]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_uT5NcAbbEeSMUp1tRQHOJw" type="4001" source="_rJICkP8wEeObup8tdlL4zw" target="_qoxukP8wEeObup8tdlL4zw" routing="Rectilinear" lineColor="0">
+      <children xmi:type="notation:DecorationNode" xmi:id="_uT50gAbbEeSMUp1tRQHOJw" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uT6bkAbbEeSMUp1tRQHOJw" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uT6bkQbbEeSMUp1tRQHOJw" visible="false" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uT6bkgbbEeSMUp1tRQHOJw" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uT6bkwbbEeSMUp1tRQHOJw" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uT6blAbbEeSMUp1tRQHOJw" x="-26" y="-78"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uT6blQbbEeSMUp1tRQHOJw" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uT6blgbbEeSMUp1tRQHOJw" x="-34" y="6"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uT6blwbbEeSMUp1tRQHOJw" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uT6bmAbbEeSMUp1tRQHOJw" x="-6" y="-31"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_uT6bmQbbEeSMUp1tRQHOJw" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_uT6bmgbbEeSMUp1tRQHOJw" x="9" y="-14"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_uT5NcQbbEeSMUp1tRQHOJw" fontName="Lucida Grande" fontHeight="11"/>
+      <element xmi:type="uml:Association" href="UMLDI.uml#A_UMLEdge_target_targetEdge"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_uT5NcgbbEeSMUp1tRQHOJw" points="[-30, 21, -290, -109]$[-30, 120, -290, -10]$[210, 120, -50, -10]"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.uml b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.uml
new file mode 100644
index 00000000000..ba3baa7234b
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/model/UMLDI.uml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:Ecore="http://www.eclipse.org/uml2/schemas/Ecore/5" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/uml2/schemas/Ecore/5 pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA">
+  <uml:Package xmi:id="_0" name="UMLDI" URI="http://www.omg.org/spec/UML/20131001/UMLDI">
+    <packagedElement xmi:type="uml:Class" xmi:id="UMLDiagram" name="UmlDiagram">
+      <ownedComment xmi:type="uml:Comment" xmi:id="UMLDiagram-_ownedComment.0" annotatedElement="UMLDiagram">
+        <body>The most general class for UML diagrams.</body>
+      </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="UMLDiagram-_generalization.0">
+        <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.dd/model/DI.uml#Diagram"/>
+      </generalization>
+      <generalization xmi:type="uml:Generalization" xmi:id="UMLDiagram-_generalization.2" general="UMLShape"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="UMLDiagramElement" name="UmlDiagramElement" isAbstract="true">
+      <ownedComment xmi:type="uml:Comment" xmi:id="UMLDiagramElement-_ownedComment.0" annotatedElement="UMLDiagramElement">
+        <body>The most general class for UML diagram interchange.</body>
+      </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="UMLDiagramElement-_generalization.0">
+        <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.dd/model/DI.uml#DiagramElement"/>
+      </generalization>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="UMLDiagramElement-modelElement" name="umlModelElement" isOrdered="true" association="A_UMLDiagramElement_modelElement_umlDiagramElement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="UMLDiagramElement-modelElement-_ownedComment.0" annotatedElement="UMLDiagramElement-modelElement">
+          <body>Restricts UMLDiagramElements to show UML Elements, rather than other language elements. </body>
+        </ownedComment>
+        <type xmi:type="uml:Class" href="pathmap://UML_METAMODELS/UML.metamodel.uml#Element"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="UMLDiagramElement-modelElement-_lowerValue"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="UMLDiagramElement-modelElement-_upperValue" value="*"/>
+        <subsettedProperty xmi:type="uml:Property" href="../../org.eclipse.papyrus.dd/model/DI.uml#DiagramElement-modelElement"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="UMLDiagramElement-sharedStyle" name="sharedUmlStyle" type="UMLStyle" association="A_UMLDiagramElement_sharedStyle_styledElement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="UMLDiagramElement-sharedStyle-_ownedComment.0" annotatedElement="UMLDiagramElement-sharedStyle">
+          <body>Restricts shared styles to UMLStyles.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="UMLDiagramElement-sharedStyle-_lowerValue"/>
+        <subsettedProperty xmi:type="uml:Property" href="../../org.eclipse.papyrus.dd/model/DI.uml#DiagramElement-sharedStyle"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="UMLDiagramElement-localStyle" name="localUmlStyle" type="UMLStyle" aggregation="composite" association="A_UMLDiagramElement_localStyle_styledElement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="UMLDiagramElement-localStyle-_ownedComment.0" annotatedElement="UMLDiagramElement-localStyle">
+          <body>Restricts owned styles to UMLStyles.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="UMLDiagramElement-localStyle-_lowerValue"/>
+        <subsettedProperty xmi:type="uml:Property" href="../../org.eclipse.papyrus.dd/model/DI.uml#DiagramElement-localStyle"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="UMLDiagramElement-owningElement" name="owningUmlDiagramElement" type="UMLDiagramElement" association="A_UMLDiagramElement_ownedElement_owningElement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="UMLDiagramElement-owningElement-_ownedComment.0" annotatedElement="UMLDiagramElement-owningElement">
+          <body>Restricts UMLDiagramElements to be owned by only UMLDiagramElements.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="UMLDiagramElement-owningElement-_lowerValue"/>
+        <subsettedProperty xmi:type="uml:Property" href="../../org.eclipse.papyrus.dd/model/DI.uml#DiagramElement-owningElement"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="UMLDiagramElement-ownedElement" name="ownedUmlDiagramElement" type="UMLDiagramElement" isOrdered="true" aggregation="composite" association="A_UMLDiagramElement_ownedElement_owningElement">
+        <ownedComment xmi:type="uml:Comment" xmi:id="UMLDiagramElement-ownedElement-_ownedComment.0" annotatedElement="UMLDiagramElement-ownedElement">
+          <body>Restricts UMLDiagramElements to own only UMLDiagramElements.</body>
+        </ownedComment>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="UMLDiagramElement-ownedElement-_lowerValue"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="UMLDiagramElement-ownedElement-_upperValue" value="*"/>
+        <subsettedProperty xmi:type="uml:Property" href="../../org.eclipse.papyrus.dd/model/DI.uml#DiagramElement-ownedElement"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="A_UMLEdge_target_targetEdge-targetEdge" name="targetUmlEdge" type="UMLEdge" isOrdered="true" association="A_UMLEdge_target_targetEdge">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="A_UMLEdge_target_targetEdge-targetEdge-_lowerValue"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="A_UMLEdge_target_targetEdge-targetEdge-_upperValue" value="*"/>
+        <subsettedProperty xmi:type="uml:Property" href="../../org.eclipse.papyrus.dd/model/DI.uml#A_target_targetEdge-targetEdge"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="A_UMLEdge_source_sourceEdge-sourceEdge" name="sourceUmlEdge" type="UMLEdge" isOrdered="true" association="A_UMLEdge_source_sourceEdge">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="A_UMLEdge_source_sourceEdge-sourceEdge-_lowerValue"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="A_UMLEdge_source_sourceEdge-sourceEdge-_upperValue" value="*"/>
+        <subsettedProperty xmi:type="uml:Property" href="../../org.eclipse.papyrus.dd/model/DI.uml#A_source_sourceEdge-sourceEdge"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="UMLEdge" name="UmlEdge">
+      <ownedComment xmi:type="uml:Comment" xmi:id="UMLEdge-_ownedComment.0" annotatedElement="UMLEdge">
+        <body>The most general class for UML diagram elements that are rendered as lines.</body>
+      </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="UMLEdge-_generalization.0">
+        <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.dd/model/DI.uml#Edge"/>
+      </generalization>
+      <generalization xmi:type="uml:Generalization" xmi:id="UMLEdge-_generalization.1" general="UMLDiagramElement"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="UMLEdge-source" name="sourceUmlDiagramElement" type="UMLDiagramElement" association="A_UMLEdge_source_sourceEdge">
+        <ownedComment xmi:type="uml:Comment" xmi:id="UMLEdge-source-_ownedComment.0" annotatedElement="UMLEdge-source">
+          <body>Restricts the sources of UMLEdges to UMLDiagramElements.</body>
+        </ownedComment>
+        <subsettedProperty xmi:type="uml:Property" href="../../org.eclipse.papyrus.dd/model/DI.uml#Edge-source"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="UMLEdge-target" name="targetUmlDiagramElement" type="UMLDiagramElement" association="A_UMLEdge_target_targetEdge">
+        <ownedComment xmi:type="uml:Comment" xmi:id="UMLEdge-target-_ownedComment.0" annotatedElement="UMLEdge-target">
+          <body>Restricts the targets of UMLEdges to UMLDiagramElements.</body>
+        </ownedComment>
+        <subsettedProperty xmi:type="uml:Property" href="../../org.eclipse.papyrus.dd/model/DI.uml#Edge-target"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="UMLShape" name="UmlShape">
+      <ownedComment xmi:type="uml:Comment" xmi:id="UMLShape-_ownedComment.0" annotatedElement="UMLShape">
+        <body>The most general class for UML diagram elements that are not rendered as lines.</body>
+      </ownedComment>
+      <generalization xmi:type="uml:Generalization" xmi:id="UMLShape-_generalization.0">
+        <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.dd/model/DI.uml#Shape"/>
+      </generalization>
+      <generalization xmi:type="uml:Generalization" xmi:id="UMLShape-_generalization.1" general="UMLDiagramElement"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="UMLStyle" name="UmlStyle">
+      <ownedComment xmi:type="uml:Comment" xmi:id="UMLStyle-_ownedComment.0" annotatedElement="UMLStyle">
+        <body>The most general class for Styles in UML.</body>
+      </ownedComment>
+      <ownedRule xmi:type="uml:Constraint" xmi:id="UMLStyle-fontsize_positive" name="fontsize_positive" constrainedElement="UMLStyle">
+        <ownedComment xmi:type="uml:Comment" xmi:id="UMLStyle-fontsize_positive-_ownedComment.0" annotatedElement="UMLStyle-fontsize_positive">
+          <body>fontSize must be greater than zero.</body>
+        </ownedComment>
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="UMLStyle-fontsize_positive-_specification">
+          <language>OCL</language>
+          <body>fontSize > 0</body>
+        </specification>
+      </ownedRule>
+      <generalization xmi:type="uml:Generalization" xmi:id="UMLStyle-_generalization.0">
+        <general xmi:type="uml:Class" href="../../org.eclipse.papyrus.dd/model/DI.uml#Style"/>
+      </generalization>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="UMLStyle-fontName" name="fontName">
+        <ownedComment xmi:type="uml:Comment" xmi:id="UMLStyle-fontName-_ownedComment.0" annotatedElement="UMLStyle-fontName">
+          <body>Name of a font used to render strings.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="../../org.eclipse.papyrus.dd/model/DC.uml#String"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="UMLStyle-fontName-_lowerValue"/>
+      </ownedAttribute>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="UMLStyle-fontSize" name="fontSize">
+        <ownedComment xmi:type="uml:Comment" xmi:id="UMLStyle-fontSize-_ownedComment.0" annotatedElement="UMLStyle-fontSize">
+          <body>Size of a font for rendering strings, given in typographical points.</body>
+        </ownedComment>
+        <type xmi:type="uml:PrimitiveType" href="../../org.eclipse.papyrus.dd/model/DC.uml#Real"/>
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="UMLStyle-fontSize-_lowerValue"/>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_UMLEdge_source_sourceEdge" name="A_sourceUmlDiagramElement_sourceUmlEdge" memberEnd="UMLEdge-source A_UMLEdge_source_sourceEdge-sourceEdge"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_UMLEdge_target_targetEdge" name="A_targetUmlDiagramElement_targetUmlEdge" memberEnd="UMLEdge-target A_UMLEdge_target_targetEdge-targetEdge"/>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_UMLDiagramElement_modelElement_umlDiagramElement" name="A_umlModelElement_umlDiagramElement" memberEnd="UMLDiagramElement-modelElement A_UMLDiagramElement_modelElement_umlDiagramElement-umlDiagramElement">
+      <ownedEnd xmi:type="uml:Property" xmi:id="A_UMLDiagramElement_modelElement_umlDiagramElement-umlDiagramElement" name="umlDiagramElement" type="UMLDiagramElement" association="A_UMLDiagramElement_modelElement_umlDiagramElement">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="A_UMLDiagramElement_modelElement_umlDiagramElement-umlDiagramElement-_lowerValue"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="A_UMLDiagramElement_modelElement_umlDiagramElement-umlDiagramElement-_upperValue" value="*"/>
+        <subsettedProperty xmi:type="uml:Property" href="../../org.eclipse.papyrus.dd/model/DI.uml#A_modelElement_diagramElement-diagramElement"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_UMLDiagramElement_localStyle_styledElement" name="A_localUmlStyle_styledUmlDiagramElement" memberEnd="UMLDiagramElement-localStyle A_UMLDiagramElement_localStyle_styledElement-styledElement">
+      <ownedEnd xmi:type="uml:Property" xmi:id="A_UMLDiagramElement_localStyle_styledElement-styledElement" name="styledUmlDiagramElement" type="UMLDiagramElement" association="A_UMLDiagramElement_localStyle_styledElement">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="A_UMLDiagramElement_localStyle_styledElement-styledElement-_lowerValue"/>
+        <subsettedProperty xmi:type="uml:Property" href="../../org.eclipse.papyrus.dd/model/DI.uml#A_sharedStyle_styledElement-styledElement"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_UMLDiagramElement_sharedStyle_styledElement" name="A_sharedUmlStyle_styledUMLDiagramElement" memberEnd="UMLDiagramElement-sharedStyle A_UMLDiagramElement_sharedStyle_styledElement-styledElement">
+      <ownedEnd xmi:type="uml:Property" xmi:id="A_UMLDiagramElement_sharedStyle_styledElement-styledElement" name="styledUmlDiagramElement" type="UMLDiagramElement" association="A_UMLDiagramElement_sharedStyle_styledElement">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="A_UMLDiagramElement_sharedStyle_styledElement-styledElement-_lowerValue"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="A_UMLDiagramElement_sharedStyle_styledElement-styledElement-_upperValue" value="*"/>
+        <subsettedProperty xmi:type="uml:Property" href="../../org.eclipse.papyrus.dd/model/DI.uml#A_sharedStyle_styledElement-styledElement"/>
+      </ownedEnd>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Association" xmi:id="A_UMLDiagramElement_ownedElement_owningElement" name="A_ownedUmlDiagramElement_owningUmlDiagramElement" memberEnd="UMLDiagramElement-ownedElement UMLDiagramElement-owningElement"/>
+    <packagedElement xmi:type="uml:Class" xmi:id="_bdk0MBO_EeSXerk-XJQMGw" name="UmlCompartment">
+      <generalization xmi:type="uml:Generalization" xmi:id="_zIr-oBO_EeSXerk-XJQMGw" general="UMLShape"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_yCxC8BPAEeSXerk-XJQMGw" name="kind" visibility="public" type="_dtjdUBPAEeSXerk-XJQMGw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_ySPpYBPAEeSXerk-XJQMGw" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_ySQQcBPAEeSXerk-XJQMGw" value="1"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_ySQ3gBPAEeSXerk-XJQMGw">
+          <value xsi:nil="true"/>
+        </defaultValue>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_RqpFEBPAEeSXerk-XJQMGw" name="UmlLabel">
+      <generalization xmi:type="uml:Generalization" xmi:id="_XTSIkBPAEeSXerk-XJQMGw" general="UMLShape"/>
+      <ownedAttribute xmi:type="uml:Property" xmi:id="_v1SewBPAEeSXerk-XJQMGw" name="kind" visibility="public" type="_mku5YBPAEeSXerk-XJQMGw">
+        <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_wM2qMBPAEeSXerk-XJQMGw" value="1"/>
+        <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_wM3RQBPAEeSXerk-XJQMGw" value="1"/>
+        <defaultValue xmi:type="uml:LiteralString" xmi:id="_wM34UBPAEeSXerk-XJQMGw">
+          <value xsi:nil="true"/>
+        </defaultValue>
+      </ownedAttribute>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_dtjdUBPAEeSXerk-XJQMGw" name="UmlCompartmentKind">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_fyphkBPAEeSXerk-XJQMGw" name="attributes"/>
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_hUu_YBPAEeSXerk-XJQMGw" name="operations"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Enumeration" xmi:id="_mku5YBPAEeSXerk-XJQMGw" name="UmlLabelKind">
+      <ownedLiteral xmi:type="uml:EnumerationLiteral" xmi:id="_rrySwBPAEeSXerk-XJQMGw" name="name"/>
+    </packagedElement>
+    <profileApplication xmi:type="uml:ProfileApplication" xmi:id="_eGYR4Po2EeOw_Nx9vOEGaA">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eGYR4fo2EeOw_Nx9vOEGaA" source="http://www.eclipse.org/uml2/2.0.0/UML">
+        <references xmi:type="ecore:EPackage" href="pathmap://UML_PROFILES/Ecore.profile.uml#_z1OFcHjqEdy8S4Cr8Rc_NA"/>
+      </eAnnotations>
+      <appliedProfile xmi:type="uml:Profile" href="pathmap://UML_PROFILES/Ecore.profile.uml#_0"/>
+    </profileApplication>
+  </uml:Package>
+  <Ecore:EPackage xmi:id="_ffMe8Po2EeOw_Nx9vOEGaA" base_Package="_0" packageName="umldi" nsPrefix="umldi" basePackage="org.eclipse.papyrus" prefix="UMLDI"/>
+</xmi:XMI>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/plugin.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/plugin.properties
new file mode 100644
index 00000000000..016166ddb5f
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/plugin.properties
@@ -0,0 +1,12 @@
+# Copyright (c) 2014 CEA LIST.
+#  
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#  
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+pluginName = UMLDI Model
+providerName = www.example.org
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/plugin.xml b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/plugin.xml
new file mode 100644
index 00000000000..26f3a03e506
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/plugin.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2014 CEA LIST.
+  
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+  
+ Contributors:
+  CEA LIST - Initial API and implementation
+-->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.ecore.generated_package">
+      <!-- @generated UMLDI -->
+      <package
+            uri="http://www.omg.org/spec/UML/20131001/UMLDI"
+            class="org.eclipse.papyrus.umldi.UMLDIPackage"
+            genModel="model/UMLDI.genmodel"/>
+   </extension>
+
+   <extension point="org.eclipse.emf.ecore.extension_parser">
+      <!-- @generated UMLDI -->
+      <parser
+            type="umldi"
+            class="org.eclipse.papyrus.umldi.util.UMLDIResourceFactoryImpl"/>
+   </extension>
+
+</plugin>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIFactory.java
new file mode 100644
index 00000000000..54cd36f6ae2
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIFactory.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage
+ * @generated
+ */
+public interface UMLDIFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	UMLDIFactory eINSTANCE = org.eclipse.papyrus.umldi.impl.UMLDIFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Uml Diagram</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Uml Diagram</em>'.
+	 * @generated
+	 */
+	UmlDiagram createUmlDiagram();
+
+	/**
+	 * Returns a new object of class '<em>Uml Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Uml Style</em>'.
+	 * @generated
+	 */
+	UmlStyle createUmlStyle();
+
+	/**
+	 * Returns a new object of class '<em>Uml Edge</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Uml Edge</em>'.
+	 * @generated
+	 */
+	UmlEdge createUmlEdge();
+
+	/**
+	 * Returns a new object of class '<em>Uml Compartment</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Uml Compartment</em>'.
+	 * @generated
+	 */
+	UmlCompartment createUmlCompartment();
+
+	/**
+	 * Returns a new object of class '<em>Uml Label</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Uml Label</em>'.
+	 * @generated
+	 */
+	UmlLabel createUmlLabel();
+
+	/**
+	 * Returns a new object of class '<em>Uml Shape</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Uml Shape</em>'.
+	 * @generated
+	 */
+	UmlShape createUmlShape();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	UMLDIPackage getUMLDIPackage();
+
+} //UMLDIFactory
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java
new file mode 100644
index 00000000000..4b0bfea1931
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java
@@ -0,0 +1,1670 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+
+import org.eclipse.papyrus.dd.di.DIPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ *   <li>each class,</li>
+ *   <li>each feature of each class,</li>
+ *   <li>each operation of each class,</li>
+ *   <li>each enum,</li>
+ *   <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.umldi.UMLDIFactory
+ * @model kind="package"
+ *        annotation="http://www.eclipse.org/emf/2002/Ecore validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL'"
+ * @generated
+ */
+public interface UMLDIPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNAME = "umldi";
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_URI = "http://www.omg.org/spec/UML/20131001/UMLDI";
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	String eNS_PREFIX = "umldi";
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	UMLDIPackage eINSTANCE = org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl <em>Uml Diagram Element</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl
+	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlDiagramElement()
+	 * @generated
+	 */
+	int UML_DIAGRAM_ELEMENT = 2;
+
+	/**
+	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__MODEL_ELEMENT = DIPackage.DIAGRAM_ELEMENT__MODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT = DIPackage.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT = DIPackage.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__LOCAL_STYLE = DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__SHARED_STYLE = DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__TARGET_EDGE = DIPackage.DIAGRAM_ELEMENT__TARGET_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__SOURCE_EDGE = DIPackage.DIAGRAM_ELEMENT__SOURCE_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT = DIPackage.DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE = DIPackage.DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE = DIPackage.DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT = DIPackage.DIAGRAM_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT = DIPackage.DIAGRAM_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE = DIPackage.DIAGRAM_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE = DIPackage.DIAGRAM_ELEMENT_FEATURE_COUNT + 6;
+
+	/**
+	 * The number of structural features of the '<em>Uml Diagram Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT_FEATURE_COUNT = DIPackage.DIAGRAM_ELEMENT_FEATURE_COUNT + 7;
+
+	/**
+	 * The number of operations of the '<em>Uml Diagram Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_ELEMENT_OPERATION_COUNT = DIPackage.DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl <em>Uml Diagram</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.umldi.impl.UmlDiagramImpl
+	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlDiagram()
+	 * @generated
+	 */
+	int UML_DIAGRAM = 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlStyleImpl <em>Uml Style</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.umldi.impl.UmlStyleImpl
+	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlStyle()
+	 * @generated
+	 */
+	int UML_STYLE = 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl <em>Uml Edge</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.umldi.impl.UmlEdgeImpl
+	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlEdge()
+	 * @generated
+	 */
+	int UML_EDGE = 4;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlShapeImpl <em>Uml Shape</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.umldi.impl.UmlShapeImpl
+	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlShape()
+	 * @generated
+	 */
+	int UML_SHAPE = 1;
+
+	/**
+	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__MODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__OWNING_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__OWNED_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__LOCAL_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__SHARED_STYLE = UML_DIAGRAM_ELEMENT__SHARED_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__TARGET_EDGE = UML_DIAGRAM_ELEMENT__TARGET_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__SOURCE_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__UML_MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__SHARED_UML_STYLE = UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__LOCAL_UML_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__OWNING_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__OWNED_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__TARGET_UML_EDGE = UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__SOURCE_UML_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE__BOUNDS = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Uml Shape</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_FEATURE_COUNT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Uml Shape</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_SHAPE_OPERATION_COUNT = UML_DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__MODEL_ELEMENT = UML_SHAPE__MODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__OWNING_DIAGRAM_ELEMENT = UML_SHAPE__OWNING_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__OWNED_DIAGRAM_ELEMENT = UML_SHAPE__OWNED_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__LOCAL_STYLE = UML_SHAPE__LOCAL_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__SHARED_STYLE = UML_SHAPE__SHARED_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__TARGET_EDGE = UML_SHAPE__TARGET_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__SOURCE_EDGE = UML_SHAPE__SOURCE_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__UML_MODEL_ELEMENT = UML_SHAPE__UML_MODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__SHARED_UML_STYLE = UML_SHAPE__SHARED_UML_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__LOCAL_UML_STYLE = UML_SHAPE__LOCAL_UML_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__OWNING_UML_DIAGRAM_ELEMENT = UML_SHAPE__OWNING_UML_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__OWNED_UML_DIAGRAM_ELEMENT = UML_SHAPE__OWNED_UML_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__TARGET_UML_EDGE = UML_SHAPE__TARGET_UML_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__SOURCE_UML_EDGE = UML_SHAPE__SOURCE_UML_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__BOUNDS = UML_SHAPE__BOUNDS;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__NAME = UML_SHAPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Documentation</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__DOCUMENTATION = UML_SHAPE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Resolution</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM__RESOLUTION = UML_SHAPE_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Uml Diagram</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_FEATURE_COUNT = UML_SHAPE_FEATURE_COUNT + 3;
+
+	/**
+	 * The number of operations of the '<em>Uml Diagram</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_DIAGRAM_OPERATION_COUNT = UML_SHAPE_OPERATION_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_STYLE__FONT_NAME = DIPackage.STYLE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Font Size</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_STYLE__FONT_SIZE = DIPackage.STYLE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of structural features of the '<em>Uml Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_STYLE_FEATURE_COUNT = DIPackage.STYLE_FEATURE_COUNT + 2;
+
+	/**
+	 * The operation id for the '<em>Fontsize Positive</em>' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP = DIPackage.STYLE_OPERATION_COUNT + 0;
+
+	/**
+	 * The number of operations of the '<em>Uml Style</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_STYLE_OPERATION_COUNT = DIPackage.STYLE_OPERATION_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__MODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__OWNING_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__OWNED_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__LOCAL_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__SHARED_STYLE = UML_DIAGRAM_ELEMENT__SHARED_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__TARGET_EDGE = UML_DIAGRAM_ELEMENT__TARGET_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__SOURCE_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__UML_MODEL_ELEMENT = UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__SHARED_UML_STYLE = UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__LOCAL_UML_STYLE = UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__OWNING_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__OWNED_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__TARGET_UML_EDGE = UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__SOURCE_UML_EDGE = UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__SOURCE_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Waypoint</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__WAYPOINT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Target Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__TARGET_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Source Uml Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Target Uml Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 4;
+
+	/**
+	 * The number of structural features of the '<em>Uml Edge</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE_FEATURE_COUNT = UML_DIAGRAM_ELEMENT_FEATURE_COUNT + 5;
+
+	/**
+	 * The number of operations of the '<em>Uml Edge</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_EDGE_OPERATION_COUNT = UML_DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
+
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl <em>Uml Compartment</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl
+	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlCompartment()
+	 * @generated
+	 */
+	int UML_COMPARTMENT = 5;
+
+	/**
+	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__MODEL_ELEMENT = UML_SHAPE__MODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__OWNING_DIAGRAM_ELEMENT = UML_SHAPE__OWNING_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__OWNED_DIAGRAM_ELEMENT = UML_SHAPE__OWNED_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__LOCAL_STYLE = UML_SHAPE__LOCAL_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__SHARED_STYLE = UML_SHAPE__SHARED_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__TARGET_EDGE = UML_SHAPE__TARGET_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__SOURCE_EDGE = UML_SHAPE__SOURCE_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__UML_MODEL_ELEMENT = UML_SHAPE__UML_MODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__SHARED_UML_STYLE = UML_SHAPE__SHARED_UML_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__LOCAL_UML_STYLE = UML_SHAPE__LOCAL_UML_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__OWNING_UML_DIAGRAM_ELEMENT = UML_SHAPE__OWNING_UML_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__OWNED_UML_DIAGRAM_ELEMENT = UML_SHAPE__OWNED_UML_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__TARGET_UML_EDGE = UML_SHAPE__TARGET_UML_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__SOURCE_UML_EDGE = UML_SHAPE__SOURCE_UML_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__BOUNDS = UML_SHAPE__BOUNDS;
+
+	/**
+	 * The feature id for the '<em><b>Kind</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT__KIND = UML_SHAPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Uml Compartment</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT_FEATURE_COUNT = UML_SHAPE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Uml Compartment</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_COMPARTMENT_OPERATION_COUNT = UML_SHAPE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlLabelImpl <em>Uml Label</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.umldi.impl.UmlLabelImpl
+	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlLabel()
+	 * @generated
+	 */
+	int UML_LABEL = 6;
+
+	/**
+	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__MODEL_ELEMENT = UML_SHAPE__MODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__OWNING_DIAGRAM_ELEMENT = UML_SHAPE__OWNING_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__OWNED_DIAGRAM_ELEMENT = UML_SHAPE__OWNED_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Local Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__LOCAL_STYLE = UML_SHAPE__LOCAL_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__SHARED_STYLE = UML_SHAPE__SHARED_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__TARGET_EDGE = UML_SHAPE__TARGET_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__SOURCE_EDGE = UML_SHAPE__SOURCE_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__UML_MODEL_ELEMENT = UML_SHAPE__UML_MODEL_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__SHARED_UML_STYLE = UML_SHAPE__SHARED_UML_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__LOCAL_UML_STYLE = UML_SHAPE__LOCAL_UML_STYLE;
+
+	/**
+	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__OWNING_UML_DIAGRAM_ELEMENT = UML_SHAPE__OWNING_UML_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__OWNED_UML_DIAGRAM_ELEMENT = UML_SHAPE__OWNED_UML_DIAGRAM_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__TARGET_UML_EDGE = UML_SHAPE__TARGET_UML_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__SOURCE_UML_EDGE = UML_SHAPE__SOURCE_UML_EDGE;
+
+	/**
+	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__BOUNDS = UML_SHAPE__BOUNDS;
+
+	/**
+	 * The feature id for the '<em><b>Kind</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL__KIND = UML_SHAPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The number of structural features of the '<em>Uml Label</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL_FEATURE_COUNT = UML_SHAPE_FEATURE_COUNT + 1;
+
+	/**
+	 * The number of operations of the '<em>Uml Label</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int UML_LABEL_OPERATION_COUNT = UML_SHAPE_OPERATION_COUNT + 0;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.UmlCompartmentKind <em>Uml Compartment Kind</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.umldi.UmlCompartmentKind
+	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlCompartmentKind()
+	 * @generated
+	 */
+	int UML_COMPARTMENT_KIND = 7;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.UmlLabelKind <em>Uml Label Kind</em>}' enum.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.umldi.UmlLabelKind
+	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlLabelKind()
+	 * @generated
+	 */
+	int UML_LABEL_KIND = 8;
+
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlDiagram <em>Uml Diagram</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Uml Diagram</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagram
+	 * @generated
+	 */
+	EClass getUmlDiagram();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlDiagramElement <em>Uml Diagram Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Uml Diagram Element</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement
+	 * @generated
+	 */
+	EClass getUmlDiagramElement();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getUmlModelElement <em>Uml Model Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Uml Model Element</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getUmlModelElement()
+	 * @see #getUmlDiagramElement()
+	 * @generated
+	 */
+	EReference getUmlDiagramElement_UmlModelElement();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSharedUmlStyle <em>Shared Uml Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Shared Uml Style</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getSharedUmlStyle()
+	 * @see #getUmlDiagramElement()
+	 * @generated
+	 */
+	EReference getUmlDiagramElement_SharedUmlStyle();
+
+	/**
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getLocalUmlStyle <em>Local Uml Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference '<em>Local Uml Style</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getLocalUmlStyle()
+	 * @see #getUmlDiagramElement()
+	 * @generated
+	 */
+	EReference getUmlDiagramElement_LocalUmlStyle();
+
+	/**
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the container reference '<em>Owning Uml Diagram Element</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement()
+	 * @see #getUmlDiagramElement()
+	 * @generated
+	 */
+	EReference getUmlDiagramElement_OwningUmlDiagramElement();
+
+	/**
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwnedUmlDiagramElement <em>Owned Uml Diagram Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the containment reference list '<em>Owned Uml Diagram Element</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getOwnedUmlDiagramElement()
+	 * @see #getUmlDiagramElement()
+	 * @generated
+	 */
+	EReference getUmlDiagramElement_OwnedUmlDiagramElement();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getTargetUmlEdge <em>Target Uml Edge</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Target Uml Edge</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getTargetUmlEdge()
+	 * @see #getUmlDiagramElement()
+	 * @generated
+	 */
+	EReference getUmlDiagramElement_TargetUmlEdge();
+
+	/**
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSourceUmlEdge <em>Source Uml Edge</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference list '<em>Source Uml Edge</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getSourceUmlEdge()
+	 * @see #getUmlDiagramElement()
+	 * @generated
+	 */
+	EReference getUmlDiagramElement_SourceUmlEdge();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlStyle <em>Uml Style</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Uml Style</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlStyle
+	 * @generated
+	 */
+	EClass getUmlStyle();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umldi.UmlStyle#getFontName <em>Font Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Font Name</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlStyle#getFontName()
+	 * @see #getUmlStyle()
+	 * @generated
+	 */
+	EAttribute getUmlStyle_FontName();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umldi.UmlStyle#getFontSize <em>Font Size</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Font Size</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlStyle#getFontSize()
+	 * @see #getUmlStyle()
+	 * @generated
+	 */
+	EAttribute getUmlStyle_FontSize();
+
+	/**
+	 * Returns the meta object for the '{@link org.eclipse.papyrus.umldi.UmlStyle#fontsizePositive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Fontsize Positive</em>}' operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the '<em>Fontsize Positive</em>' operation.
+	 * @see org.eclipse.papyrus.umldi.UmlStyle#fontsizePositive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * @generated
+	 */
+	EOperation getUmlStyle__FontsizePositive__DiagnosticChain_Map();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlEdge <em>Uml Edge</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Uml Edge</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlEdge
+	 * @generated
+	 */
+	EClass getUmlEdge();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement <em>Source Uml Diagram Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Source Uml Diagram Element</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement()
+	 * @see #getUmlEdge()
+	 * @generated
+	 */
+	EReference getUmlEdge_SourceUmlDiagramElement();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement <em>Target Uml Diagram Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the reference '<em>Target Uml Diagram Element</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement()
+	 * @see #getUmlEdge()
+	 * @generated
+	 */
+	EReference getUmlEdge_TargetUmlDiagramElement();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlCompartment <em>Uml Compartment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Uml Compartment</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlCompartment
+	 * @generated
+	 */
+	EClass getUmlCompartment();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umldi.UmlCompartment#getKind <em>Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Kind</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlCompartment#getKind()
+	 * @see #getUmlCompartment()
+	 * @generated
+	 */
+	EAttribute getUmlCompartment_Kind();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlLabel <em>Uml Label</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Uml Label</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlLabel
+	 * @generated
+	 */
+	EClass getUmlLabel();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umldi.UmlLabel#getKind <em>Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for the attribute '<em>Kind</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlLabel#getKind()
+	 * @see #getUmlLabel()
+	 * @generated
+	 */
+	EAttribute getUmlLabel_Kind();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.umldi.UmlCompartmentKind <em>Uml Compartment Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Uml Compartment Kind</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlCompartmentKind
+	 * @generated
+	 */
+	EEnum getUmlCompartmentKind();
+
+	/**
+	 * Returns the meta object for enum '{@link org.eclipse.papyrus.umldi.UmlLabelKind <em>Uml Label Kind</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for enum '<em>Uml Label Kind</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlLabelKind
+	 * @generated
+	 */
+	EEnum getUmlLabelKind();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlShape <em>Uml Shape</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Uml Shape</em>'.
+	 * @see org.eclipse.papyrus.umldi.UmlShape
+	 * @generated
+	 */
+	EClass getUmlShape();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	UMLDIFactory getUMLDIFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 *   <li>each class,</li>
+	 *   <li>each feature of each class,</li>
+	 *   <li>each operation of each class,</li>
+	 *   <li>each enum,</li>
+	 *   <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl <em>Uml Diagram</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.umldi.impl.UmlDiagramImpl
+		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlDiagram()
+		 * @generated
+		 */
+		EClass UML_DIAGRAM = eINSTANCE.getUmlDiagram();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl <em>Uml Diagram Element</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl
+		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlDiagramElement()
+		 * @generated
+		 */
+		EClass UML_DIAGRAM_ELEMENT = eINSTANCE.getUmlDiagramElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Uml Model Element</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT = eINSTANCE.getUmlDiagramElement_UmlModelElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Shared Uml Style</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE = eINSTANCE.getUmlDiagramElement_SharedUmlStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Local Uml Style</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE = eINSTANCE.getUmlDiagramElement_LocalUmlStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Owning Uml Diagram Element</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT = eINSTANCE.getUmlDiagramElement_OwningUmlDiagramElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT = eINSTANCE.getUmlDiagramElement_OwnedUmlDiagramElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Target Uml Edge</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE = eINSTANCE.getUmlDiagramElement_TargetUmlEdge();
+
+		/**
+		 * The meta object literal for the '<em><b>Source Uml Edge</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE = eINSTANCE.getUmlDiagramElement_SourceUmlEdge();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlStyleImpl <em>Uml Style</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.umldi.impl.UmlStyleImpl
+		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlStyle()
+		 * @generated
+		 */
+		EClass UML_STYLE = eINSTANCE.getUmlStyle();
+
+		/**
+		 * The meta object literal for the '<em><b>Font Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute UML_STYLE__FONT_NAME = eINSTANCE.getUmlStyle_FontName();
+
+		/**
+		 * The meta object literal for the '<em><b>Font Size</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute UML_STYLE__FONT_SIZE = eINSTANCE.getUmlStyle_FontSize();
+
+		/**
+		 * The meta object literal for the '<em><b>Fontsize Positive</b></em>' operation.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EOperation UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getUmlStyle__FontsizePositive__DiagnosticChain_Map();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl <em>Uml Edge</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.umldi.impl.UmlEdgeImpl
+		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlEdge()
+		 * @generated
+		 */
+		EClass UML_EDGE = eINSTANCE.getUmlEdge();
+
+		/**
+		 * The meta object literal for the '<em><b>Source Uml Diagram Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT = eINSTANCE.getUmlEdge_SourceUmlDiagramElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Target Uml Diagram Element</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EReference UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT = eINSTANCE.getUmlEdge_TargetUmlDiagramElement();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl <em>Uml Compartment</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl
+		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlCompartment()
+		 * @generated
+		 */
+		EClass UML_COMPARTMENT = eINSTANCE.getUmlCompartment();
+
+		/**
+		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute UML_COMPARTMENT__KIND = eINSTANCE.getUmlCompartment_Kind();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlLabelImpl <em>Uml Label</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.umldi.impl.UmlLabelImpl
+		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlLabel()
+		 * @generated
+		 */
+		EClass UML_LABEL = eINSTANCE.getUmlLabel();
+
+		/**
+		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @generated
+		 */
+		EAttribute UML_LABEL__KIND = eINSTANCE.getUmlLabel_Kind();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.UmlCompartmentKind <em>Uml Compartment Kind</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.umldi.UmlCompartmentKind
+		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlCompartmentKind()
+		 * @generated
+		 */
+		EEnum UML_COMPARTMENT_KIND = eINSTANCE.getUmlCompartmentKind();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.UmlLabelKind <em>Uml Label Kind</em>}' enum.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.umldi.UmlLabelKind
+		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlLabelKind()
+		 * @generated
+		 */
+		EEnum UML_LABEL_KIND = eINSTANCE.getUmlLabelKind();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlShapeImpl <em>Uml Shape</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.papyrus.umldi.impl.UmlShapeImpl
+		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlShape()
+		 * @generated
+		 */
+		EClass UML_SHAPE = eINSTANCE.getUmlShape();
+
+	}
+
+} //UMLDIPackage
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java
new file mode 100644
index 00000000000..0483e558079
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Uml Compartment</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlCompartment#getKind <em>Kind</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlCompartment()
+ * @model
+ * @generated
+ */
+public interface UmlCompartment extends UmlShape {
+	/**
+	 * Returns the value of the '<em><b>Kind</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.umldi.UmlCompartmentKind}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Kind</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Kind</em>' attribute.
+	 * @see org.eclipse.papyrus.umldi.UmlCompartmentKind
+	 * @see #setKind(UmlCompartmentKind)
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlCompartment_Kind()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	UmlCompartmentKind getKind();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlCompartment#getKind <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Kind</em>' attribute.
+	 * @see org.eclipse.papyrus.umldi.UmlCompartmentKind
+	 * @see #getKind()
+	 * @generated
+	 */
+	void setKind(UmlCompartmentKind value);
+
+} // UmlCompartment
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java
new file mode 100644
index 00000000000..426a00d7b0d
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java
@@ -0,0 +1,217 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Uml Compartment Kind</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlCompartmentKind()
+ * @model
+ * @generated
+ */
+public enum UmlCompartmentKind implements Enumerator {
+	/**
+	 * The '<em><b>Attributes</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #ATTRIBUTES_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	ATTRIBUTES(0, "attributes", "attributes"),
+
+	/**
+	 * The '<em><b>Operations</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #OPERATIONS_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	OPERATIONS(1, "operations", "operations");
+
+	/**
+	 * The '<em><b>Attributes</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Attributes</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #ATTRIBUTES
+	 * @model name="attributes"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int ATTRIBUTES_VALUE = 0;
+
+	/**
+	 * The '<em><b>Operations</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Operations</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #OPERATIONS
+	 * @model name="operations"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int OPERATIONS_VALUE = 1;
+
+	/**
+	 * An array of all the '<em><b>Uml Compartment Kind</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final UmlCompartmentKind[] VALUES_ARRAY =
+		new UmlCompartmentKind[] {
+			ATTRIBUTES,
+			OPERATIONS,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Uml Compartment Kind</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<UmlCompartmentKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Uml Compartment Kind</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static UmlCompartmentKind get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			UmlCompartmentKind result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Uml Compartment Kind</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static UmlCompartmentKind getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			UmlCompartmentKind result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Uml Compartment Kind</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static UmlCompartmentKind get(int value) {
+		switch (value) {
+			case ATTRIBUTES_VALUE: return ATTRIBUTES;
+			case OPERATIONS_VALUE: return OPERATIONS;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private UmlCompartmentKind(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //UmlCompartmentKind
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java
new file mode 100644
index 00000000000..9b4028f84c6
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi;
+
+import org.eclipse.papyrus.dd.di.Diagram;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Uml Diagram</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * The most general class for UML diagrams.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagram()
+ * @model
+ * @generated
+ */
+public interface UmlDiagram extends UmlShape, Diagram {
+} // UmlDiagram
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java
new file mode 100644
index 00000000000..88e06342686
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java
@@ -0,0 +1,234 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.papyrus.dd.di.DiagramElement;
+
+import org.eclipse.uml2.uml.Element;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Uml Diagram Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * The most general class for UML diagram interchange.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getUmlModelElement <em>Uml Model Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSharedUmlStyle <em>Shared Uml Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getLocalUmlStyle <em>Local Uml Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwnedUmlDiagramElement <em>Owned Uml Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getTargetUmlEdge <em>Target Uml Edge</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSourceUmlEdge <em>Source Uml Edge</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement()
+ * @model abstract="true"
+ * @generated
+ */
+public interface UmlDiagramElement extends DiagramElement {
+	/**
+	 * Returns the value of the '<em><b>Uml Model Element</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.uml2.uml.Element}.
+	 * <p>
+	 * This feature subsets the following features:
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getModelElement() <em>Model Element</em>}'</li>
+	 * </ul>
+	 * </p>
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Restricts UMLDiagramElements to show UML Elements, rather than other language elements. 
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Uml Model Element</em>' reference list.
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_UmlModelElement()
+	 * @model
+	 * @generated
+	 */
+	EList<Element> getUmlModelElement();
+
+	/**
+	 * Returns the value of the '<em><b>Shared Uml Style</b></em>' reference.
+	 * <p>
+	 * This feature subsets the following features:
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle() <em>Shared Style</em>}'</li>
+	 * </ul>
+	 * </p>
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Restricts shared styles to UMLStyles.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Shared Uml Style</em>' reference.
+	 * @see #setSharedUmlStyle(UmlStyle)
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_SharedUmlStyle()
+	 * @model ordered="false"
+	 * @generated
+	 */
+	UmlStyle getSharedUmlStyle();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSharedUmlStyle <em>Shared Uml Style</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Shared Uml Style</em>' reference.
+	 * @see #getSharedUmlStyle()
+	 * @generated
+	 */
+	void setSharedUmlStyle(UmlStyle value);
+
+	/**
+	 * Returns the value of the '<em><b>Local Uml Style</b></em>' containment reference.
+	 * <p>
+	 * This feature subsets the following features:
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle() <em>Local Style</em>}'</li>
+	 * </ul>
+	 * </p>
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Restricts owned styles to UMLStyles.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Local Uml Style</em>' containment reference.
+	 * @see #setLocalUmlStyle(UmlStyle)
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_LocalUmlStyle()
+	 * @model containment="true" ordered="false"
+	 * @generated
+	 */
+	UmlStyle getLocalUmlStyle();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getLocalUmlStyle <em>Local Uml Style</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Local Uml Style</em>' containment reference.
+	 * @see #getLocalUmlStyle()
+	 * @generated
+	 */
+	void setLocalUmlStyle(UmlStyle value);
+
+	/**
+	 * Returns the value of the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwnedUmlDiagramElement <em>Owned Uml Diagram Element</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement() <em>Owning Diagram Element</em>}'</li>
+	 * </ul>
+	 * </p>
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Restricts UMLDiagramElements to be owned by only UMLDiagramElements.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Owning Uml Diagram Element</em>' container reference.
+	 * @see #setOwningUmlDiagramElement(UmlDiagramElement)
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_OwningUmlDiagramElement()
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getOwnedUmlDiagramElement
+	 * @model opposite="ownedUmlDiagramElement" transient="false" ordered="false"
+	 * @generated
+	 */
+	UmlDiagramElement getOwningUmlDiagramElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Owning Uml Diagram Element</em>' container reference.
+	 * @see #getOwningUmlDiagramElement()
+	 * @generated
+	 */
+	void setOwningUmlDiagramElement(UmlDiagramElement value);
+
+	/**
+	 * Returns the value of the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.umldi.UmlDiagramElement}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement() <em>Owned Diagram Element</em>}'</li>
+	 * </ul>
+	 * </p>
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Restricts UMLDiagramElements to own only UMLDiagramElements.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Owned Uml Diagram Element</em>' containment reference list.
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_OwnedUmlDiagramElement()
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement
+	 * @model opposite="owningUmlDiagramElement" containment="true"
+	 * @generated
+	 */
+	EList<UmlDiagramElement> getOwnedUmlDiagramElement();
+
+	/**
+	 * Returns the value of the '<em><b>Target Uml Edge</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.umldi.UmlEdge}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement <em>Target Uml Diagram Element</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge() <em>Target Edge</em>}'</li>
+	 * </ul>
+	 * </p>
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Target Uml Edge</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Target Uml Edge</em>' reference list.
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_TargetUmlEdge()
+	 * @see org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement
+	 * @model opposite="targetUmlDiagramElement"
+	 * @generated
+	 */
+	EList<UmlEdge> getTargetUmlEdge();
+
+	/**
+	 * Returns the value of the '<em><b>Source Uml Edge</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.papyrus.umldi.UmlEdge}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement <em>Source Uml Diagram Element</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge() <em>Source Edge</em>}'</li>
+	 * </ul>
+	 * </p>
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Source Uml Edge</em>' reference list isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Source Uml Edge</em>' reference list.
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_SourceUmlEdge()
+	 * @see org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement
+	 * @model opposite="sourceUmlDiagramElement"
+	 * @generated
+	 */
+	EList<UmlEdge> getSourceUmlEdge();
+
+} // UmlDiagramElement
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java
new file mode 100644
index 00000000000..398975b0786
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java
@@ -0,0 +1,104 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi;
+
+import org.eclipse.papyrus.dd.di.Edge;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Uml Edge</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * The most general class for UML diagram elements that are rendered as lines.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement <em>Source Uml Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement <em>Target Uml Diagram Element</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlEdge()
+ * @model
+ * @generated
+ */
+public interface UmlEdge extends UmlDiagramElement, Edge {
+	/**
+	 * Returns the value of the '<em><b>Source Uml Diagram Element</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSourceUmlEdge <em>Source Uml Edge</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement() <em>Source Diagram Element</em>}'</li>
+	 * </ul>
+	 * </p>
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Restricts the sources of UMLEdges to UMLDiagramElements.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Source Uml Diagram Element</em>' reference.
+	 * @see #setSourceUmlDiagramElement(UmlDiagramElement)
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlEdge_SourceUmlDiagramElement()
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getSourceUmlEdge
+	 * @model opposite="sourceUmlEdge" required="true" ordered="false"
+	 * @generated
+	 */
+	UmlDiagramElement getSourceUmlDiagramElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement <em>Source Uml Diagram Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Source Uml Diagram Element</em>' reference.
+	 * @see #getSourceUmlDiagramElement()
+	 * @generated
+	 */
+	void setSourceUmlDiagramElement(UmlDiagramElement value);
+
+	/**
+	 * Returns the value of the '<em><b>Target Uml Diagram Element</b></em>' reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getTargetUmlEdge <em>Target Uml Edge</em>}'.
+	 * <p>
+	 * This feature subsets the following features:
+	 * <ul>
+	 *   <li>'{@link org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement() <em>Target Diagram Element</em>}'</li>
+	 * </ul>
+	 * </p>
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Restricts the targets of UMLEdges to UMLDiagramElements.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Target Uml Diagram Element</em>' reference.
+	 * @see #setTargetUmlDiagramElement(UmlDiagramElement)
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlEdge_TargetUmlDiagramElement()
+	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getTargetUmlEdge
+	 * @model opposite="targetUmlEdge" required="true" ordered="false"
+	 * @generated
+	 */
+	UmlDiagramElement getTargetUmlDiagramElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement <em>Target Uml Diagram Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Target Uml Diagram Element</em>' reference.
+	 * @see #getTargetUmlDiagramElement()
+	 * @generated
+	 */
+	void setTargetUmlDiagramElement(UmlDiagramElement value);
+
+} // UmlEdge
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java
new file mode 100644
index 00000000000..847adacffdd
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Uml Label</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlLabel#getKind <em>Kind</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlLabel()
+ * @model
+ * @generated
+ */
+public interface UmlLabel extends UmlShape {
+	/**
+	 * Returns the value of the '<em><b>Kind</b></em>' attribute.
+	 * The literals are from the enumeration {@link org.eclipse.papyrus.umldi.UmlLabelKind}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Kind</em>' attribute isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @return the value of the '<em>Kind</em>' attribute.
+	 * @see org.eclipse.papyrus.umldi.UmlLabelKind
+	 * @see #setKind(UmlLabelKind)
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlLabel_Kind()
+	 * @model required="true" ordered="false"
+	 * @generated
+	 */
+	UmlLabelKind getKind();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlLabel#getKind <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Kind</em>' attribute.
+	 * @see org.eclipse.papyrus.umldi.UmlLabelKind
+	 * @see #getKind()
+	 * @generated
+	 */
+	void setKind(UmlLabelKind value);
+
+} // UmlLabel
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java
new file mode 100644
index 00000000000..4092f638b2a
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java
@@ -0,0 +1,190 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>Uml Label Kind</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlLabelKind()
+ * @model
+ * @generated
+ */
+public enum UmlLabelKind implements Enumerator {
+	/**
+	 * The '<em><b>Name</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #NAME_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	NAME(0, "name", "name");
+
+	/**
+	 * The '<em><b>Name</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of '<em><b>Name</b></em>' literal object isn't clear,
+	 * there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * @see #NAME
+	 * @model name="name"
+	 * @generated
+	 * @ordered
+	 */
+	public static final int NAME_VALUE = 0;
+
+	/**
+	 * An array of all the '<em><b>Uml Label Kind</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final UmlLabelKind[] VALUES_ARRAY =
+		new UmlLabelKind[] {
+			NAME,
+		};
+
+	/**
+	 * A public read-only list of all the '<em><b>Uml Label Kind</b></em>' enumerators.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final List<UmlLabelKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+	/**
+	 * Returns the '<em><b>Uml Label Kind</b></em>' literal with the specified literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static UmlLabelKind get(String literal) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			UmlLabelKind result = VALUES_ARRAY[i];
+			if (result.toString().equals(literal)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Uml Label Kind</b></em>' literal with the specified name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static UmlLabelKind getByName(String name) {
+		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+			UmlLabelKind result = VALUES_ARRAY[i];
+			if (result.getName().equals(name)) {
+				return result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the '<em><b>Uml Label Kind</b></em>' literal with the specified integer value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static UmlLabelKind get(int value) {
+		switch (value) {
+			case NAME_VALUE: return NAME;
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final int value;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String name;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private final String literal;
+
+	/**
+	 * Only this class can construct instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private UmlLabelKind(int value, String name, String literal) {
+		this.value = value;
+		this.name = name;
+		this.literal = literal;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public int getValue() {
+	  return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getName() {
+	  return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getLiteral() {
+	  return literal;
+	}
+
+	/**
+	 * Returns the literal value of the enumerator, which is its string representation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		return literal;
+	}
+	
+} //UmlLabelKind
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlShape.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlShape.java
new file mode 100644
index 00000000000..4b700a1067f
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlShape.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi;
+
+import org.eclipse.papyrus.dd.di.Shape;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Uml Shape</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * The most general class for UML diagram elements that are not rendered as lines.
+ * <!-- end-model-doc -->
+ *
+ *
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlShape()
+ * @model
+ * @generated
+ */
+public interface UmlShape extends UmlDiagramElement, Shape {
+} // UmlShape
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java
new file mode 100644
index 00000000000..034f6e514bb
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.DiagnosticChain;
+
+import org.eclipse.papyrus.dd.di.Style;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Uml Style</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <!-- begin-model-doc -->
+ * The most general class for Styles in UML.
+ * <!-- end-model-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlStyle#getFontName <em>Font Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.UmlStyle#getFontSize <em>Font Size</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlStyle()
+ * @model
+ * @generated
+ */
+public interface UmlStyle extends Style {
+	/**
+	 * Returns the value of the '<em><b>Font Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Name of a font used to render strings.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Font Name</em>' attribute.
+	 * @see #setFontName(String)
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlStyle_FontName()
+	 * @model dataType="org.eclipse.papyrus.dd.dc.String" ordered="false"
+	 * @generated
+	 */
+	String getFontName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlStyle#getFontName <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Font Name</em>' attribute.
+	 * @see #getFontName()
+	 * @generated
+	 */
+	void setFontName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Font Size</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * Size of a font for rendering strings, given in typographical points.
+	 * <!-- end-model-doc -->
+	 * @return the value of the '<em>Font Size</em>' attribute.
+	 * @see #setFontSize(double)
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlStyle_FontSize()
+	 * @model dataType="org.eclipse.papyrus.dd.dc.Real" ordered="false"
+	 * @generated
+	 */
+	double getFontSize();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlStyle#getFontSize <em>Font Size</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param value the new value of the '<em>Font Size</em>' attribute.
+	 * @see #getFontSize()
+	 * @generated
+	 */
+	void setFontSize(double value);
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * <!-- begin-model-doc -->
+	 * fontSize must be greater than zero.
+	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
+	 * @param context The cache of context-specific information.
+	 * <!-- end-model-doc -->
+	 * @model annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='fontSize > 0'"
+	 * @generated
+	 */
+	boolean fontsizePositive(DiagnosticChain diagnostics, Map<Object, Object> context);
+
+} // UmlStyle
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java
new file mode 100644
index 00000000000..5f34bd02cd8
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java
@@ -0,0 +1,234 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.impl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+
+import org.eclipse.papyrus.umldi.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static UMLDIFactory init() {
+		try {
+			UMLDIFactory theUMLDIFactory = (UMLDIFactory)EPackage.Registry.INSTANCE.getEFactory(UMLDIPackage.eNS_URI);
+			if (theUMLDIFactory != null) {
+				return theUMLDIFactory;
+			}
+		}
+		catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new UMLDIFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDIFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case UMLDIPackage.UML_DIAGRAM: return createUmlDiagram();
+			case UMLDIPackage.UML_SHAPE: return createUmlShape();
+			case UMLDIPackage.UML_STYLE: return createUmlStyle();
+			case UMLDIPackage.UML_EDGE: return createUmlEdge();
+			case UMLDIPackage.UML_COMPARTMENT: return createUmlCompartment();
+			case UMLDIPackage.UML_LABEL: return createUmlLabel();
+			default:
+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object createFromString(EDataType eDataType, String initialValue) {
+		switch (eDataType.getClassifierID()) {
+			case UMLDIPackage.UML_COMPARTMENT_KIND:
+				return createUmlCompartmentKindFromString(eDataType, initialValue);
+			case UMLDIPackage.UML_LABEL_KIND:
+				return createUmlLabelKindFromString(eDataType, initialValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String convertToString(EDataType eDataType, Object instanceValue) {
+		switch (eDataType.getClassifierID()) {
+			case UMLDIPackage.UML_COMPARTMENT_KIND:
+				return convertUmlCompartmentKindToString(eDataType, instanceValue);
+			case UMLDIPackage.UML_LABEL_KIND:
+				return convertUmlLabelKindToString(eDataType, instanceValue);
+			default:
+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlDiagram createUmlDiagram() {
+		UmlDiagramImpl umlDiagram = new UmlDiagramImpl();
+		return umlDiagram;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlStyle createUmlStyle() {
+		UmlStyleImpl umlStyle = new UmlStyleImpl();
+		return umlStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlEdge createUmlEdge() {
+		UmlEdgeImpl umlEdge = new UmlEdgeImpl();
+		return umlEdge;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlCompartment createUmlCompartment() {
+		UmlCompartmentImpl umlCompartment = new UmlCompartmentImpl();
+		return umlCompartment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlLabel createUmlLabel() {
+		UmlLabelImpl umlLabel = new UmlLabelImpl();
+		return umlLabel;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlCompartmentKind createUmlCompartmentKindFromString(EDataType eDataType, String initialValue) {
+		UmlCompartmentKind result = UmlCompartmentKind.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertUmlCompartmentKindToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlLabelKind createUmlLabelKindFromString(EDataType eDataType, String initialValue) {
+		UmlLabelKind result = UmlLabelKind.get(initialValue);
+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		return result;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String convertUmlLabelKindToString(EDataType eDataType, Object instanceValue) {
+		return instanceValue == null ? null : instanceValue.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlShape createUmlShape() {
+		UmlShapeImpl umlShape = new UmlShapeImpl();
+		return umlShape;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDIPackage getUMLDIPackage() {
+		return (UMLDIPackage)getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static UMLDIPackage getPackage() {
+		return UMLDIPackage.eINSTANCE;
+	}
+
+} //UMLDIFactoryImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java
new file mode 100644
index 00000000000..caccb6eddcd
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java
@@ -0,0 +1,674 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.impl;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EGenericType;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EValidator;
+
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+
+import org.eclipse.papyrus.dd.dc.DCPackage;
+
+import org.eclipse.papyrus.dd.di.DIPackage;
+
+import org.eclipse.papyrus.umldi.UMLDIFactory;
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlCompartment;
+import org.eclipse.papyrus.umldi.UmlCompartmentKind;
+import org.eclipse.papyrus.umldi.UmlDiagram;
+import org.eclipse.papyrus.umldi.UmlDiagramElement;
+import org.eclipse.papyrus.umldi.UmlEdge;
+import org.eclipse.papyrus.umldi.UmlLabel;
+import org.eclipse.papyrus.umldi.UmlLabelKind;
+import org.eclipse.papyrus.umldi.UmlShape;
+import org.eclipse.papyrus.umldi.UmlStyle;
+
+import org.eclipse.papyrus.umldi.util.UMLDIValidator;
+
+import org.eclipse.uml2.uml.UMLPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass umlDiagramEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass umlDiagramElementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass umlStyleEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass umlEdgeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass umlCompartmentEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass umlLabelEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum umlCompartmentKindEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EEnum umlLabelKindEEnum = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass umlShapeEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with
+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>Note: the correct way to create the package is via the static
+	 * factory method {@link #init init()}, which also performs
+	 * initialization of the package, or returns the registered package,
+	 * if one already exists.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private UMLDIPackageImpl() {
+		super(eNS_URI, UMLDIFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>This method is used to initialize {@link UMLDIPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static UMLDIPackage init() {
+		if (isInited) return (UMLDIPackage)EPackage.Registry.INSTANCE.getEPackage(UMLDIPackage.eNS_URI);
+
+		// Obtain or create and register package
+		UMLDIPackageImpl theUMLDIPackage = (UMLDIPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UMLDIPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UMLDIPackageImpl());
+
+		isInited = true;
+
+		// Initialize simple dependencies
+		DIPackage.eINSTANCE.eClass();
+		UMLPackage.eINSTANCE.eClass();
+
+		// Create package meta-data objects
+		theUMLDIPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theUMLDIPackage.initializePackageContents();
+
+		// Register package validator
+		EValidator.Registry.INSTANCE.put
+			(theUMLDIPackage, 
+			 new EValidator.Descriptor() {
+				 public EValidator getEValidator() {
+					 return UMLDIValidator.INSTANCE;
+				 }
+			 });
+
+		// Mark meta-data to indicate it can't be changed
+		theUMLDIPackage.freeze();
+
+  
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(UMLDIPackage.eNS_URI, theUMLDIPackage);
+		return theUMLDIPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getUmlDiagram() {
+		return umlDiagramEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getUmlDiagramElement() {
+		return umlDiagramElementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getUmlDiagramElement_UmlModelElement() {
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getUmlDiagramElement_SharedUmlStyle() {
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getUmlDiagramElement_LocalUmlStyle() {
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getUmlDiagramElement_OwningUmlDiagramElement() {
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getUmlDiagramElement_OwnedUmlDiagramElement() {
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getUmlDiagramElement_TargetUmlEdge() {
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getUmlDiagramElement_SourceUmlEdge() {
+		return (EReference)umlDiagramElementEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getUmlStyle() {
+		return umlStyleEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getUmlStyle_FontName() {
+		return (EAttribute)umlStyleEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getUmlStyle_FontSize() {
+		return (EAttribute)umlStyleEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EOperation getUmlStyle__FontsizePositive__DiagnosticChain_Map() {
+		return umlStyleEClass.getEOperations().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getUmlEdge() {
+		return umlEdgeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getUmlEdge_SourceUmlDiagramElement() {
+		return (EReference)umlEdgeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EReference getUmlEdge_TargetUmlDiagramElement() {
+		return (EReference)umlEdgeEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getUmlCompartment() {
+		return umlCompartmentEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getUmlCompartment_Kind() {
+		return (EAttribute)umlCompartmentEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getUmlLabel() {
+		return umlLabelEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getUmlLabel_Kind() {
+		return (EAttribute)umlLabelEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EEnum getUmlCompartmentKind() {
+		return umlCompartmentKindEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EEnum getUmlLabelKind() {
+		return umlLabelKindEEnum;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EClass getUmlShape() {
+		return umlShapeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDIFactory getUMLDIFactory() {
+		return (UMLDIFactory)getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package.  This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated) return;
+		isCreated = true;
+
+		// Create classes and their features
+		umlDiagramEClass = createEClass(UML_DIAGRAM);
+
+		umlShapeEClass = createEClass(UML_SHAPE);
+
+		umlDiagramElementEClass = createEClass(UML_DIAGRAM_ELEMENT);
+		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT);
+		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE);
+		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE);
+		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT);
+		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT);
+		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE);
+		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE);
+
+		umlStyleEClass = createEClass(UML_STYLE);
+		createEAttribute(umlStyleEClass, UML_STYLE__FONT_NAME);
+		createEAttribute(umlStyleEClass, UML_STYLE__FONT_SIZE);
+		createEOperation(umlStyleEClass, UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP);
+
+		umlEdgeEClass = createEClass(UML_EDGE);
+		createEReference(umlEdgeEClass, UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT);
+		createEReference(umlEdgeEClass, UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT);
+
+		umlCompartmentEClass = createEClass(UML_COMPARTMENT);
+		createEAttribute(umlCompartmentEClass, UML_COMPARTMENT__KIND);
+
+		umlLabelEClass = createEClass(UML_LABEL);
+		createEAttribute(umlLabelEClass, UML_LABEL__KIND);
+
+		// Create enums
+		umlCompartmentKindEEnum = createEEnum(UML_COMPARTMENT_KIND);
+		umlLabelKindEEnum = createEEnum(UML_LABEL_KIND);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model.  This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized) return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Obtain other dependent packages
+		DIPackage theDIPackage = (DIPackage)EPackage.Registry.INSTANCE.getEPackage(DIPackage.eNS_URI);
+		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
+		DCPackage theDCPackage = (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		umlDiagramEClass.getESuperTypes().add(this.getUmlShape());
+		umlDiagramEClass.getESuperTypes().add(theDIPackage.getDiagram());
+		umlShapeEClass.getESuperTypes().add(this.getUmlDiagramElement());
+		umlShapeEClass.getESuperTypes().add(theDIPackage.getShape());
+		umlDiagramElementEClass.getESuperTypes().add(theDIPackage.getDiagramElement());
+		umlStyleEClass.getESuperTypes().add(theDIPackage.getStyle());
+		umlEdgeEClass.getESuperTypes().add(this.getUmlDiagramElement());
+		umlEdgeEClass.getESuperTypes().add(theDIPackage.getEdge());
+		umlCompartmentEClass.getESuperTypes().add(this.getUmlShape());
+		umlLabelEClass.getESuperTypes().add(this.getUmlShape());
+
+		// Initialize classes, features, and operations; add parameters
+		initEClass(umlDiagramEClass, UmlDiagram.class, "UmlDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(umlShapeEClass, UmlShape.class, "UmlShape", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+		initEClass(umlDiagramElementEClass, UmlDiagramElement.class, "UmlDiagramElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getUmlDiagramElement_UmlModelElement(), theUMLPackage.getElement(), null, "umlModelElement", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getUmlDiagramElement_SharedUmlStyle(), this.getUmlStyle(), null, "sharedUmlStyle", null, 0, 1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getUmlDiagramElement_LocalUmlStyle(), this.getUmlStyle(), null, "localUmlStyle", null, 0, 1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getUmlDiagramElement_OwningUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_OwnedUmlDiagramElement(), "owningUmlDiagramElement", null, 0, 1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getUmlDiagramElement_OwnedUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_OwningUmlDiagramElement(), "ownedUmlDiagramElement", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getUmlDiagramElement_TargetUmlEdge(), this.getUmlEdge(), this.getUmlEdge_TargetUmlDiagramElement(), "targetUmlEdge", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getUmlDiagramElement_SourceUmlEdge(), this.getUmlEdge(), this.getUmlEdge_SourceUmlDiagramElement(), "sourceUmlEdge", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(umlStyleEClass, UmlStyle.class, "UmlStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getUmlStyle_FontName(), theDCPackage.getString(), "fontName", null, 0, 1, UmlStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEAttribute(getUmlStyle_FontSize(), theDCPackage.getReal(), "fontSize", null, 0, 1, UmlStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		EOperation op = initEOperation(getUmlStyle__FontsizePositive__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "fontsizePositive", 0, 1, IS_UNIQUE, IS_ORDERED);
+		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
+		EGenericType g1 = createEGenericType(ecorePackage.getEMap());
+		EGenericType g2 = createEGenericType(ecorePackage.getEJavaObject());
+		g1.getETypeArguments().add(g2);
+		g2 = createEGenericType(ecorePackage.getEJavaObject());
+		g1.getETypeArguments().add(g2);
+		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
+
+		initEClass(umlEdgeEClass, UmlEdge.class, "UmlEdge", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getUmlEdge_SourceUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_SourceUmlEdge(), "sourceUmlDiagramElement", null, 1, 1, UmlEdge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+		initEReference(getUmlEdge_TargetUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_TargetUmlEdge(), "targetUmlDiagramElement", null, 1, 1, UmlEdge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(umlCompartmentEClass, UmlCompartment.class, "UmlCompartment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getUmlCompartment_Kind(), this.getUmlCompartmentKind(), "kind", null, 1, 1, UmlCompartment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		initEClass(umlLabelEClass, UmlLabel.class, "UmlLabel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getUmlLabel_Kind(), this.getUmlLabelKind(), "kind", null, 1, 1, UmlLabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+
+		// Initialize enums and add enum literals
+		initEEnum(umlCompartmentKindEEnum, UmlCompartmentKind.class, "UmlCompartmentKind");
+		addEEnumLiteral(umlCompartmentKindEEnum, UmlCompartmentKind.ATTRIBUTES);
+		addEEnumLiteral(umlCompartmentKindEEnum, UmlCompartmentKind.OPERATIONS);
+
+		initEEnum(umlLabelKindEEnum, UmlLabelKind.class, "UmlLabelKind");
+		addEEnumLiteral(umlLabelKindEEnum, UmlLabelKind.NAME);
+
+		// Create resource
+		createResource(eNS_URI);
+
+		// Create annotations
+		// http://www.eclipse.org/emf/2002/Ecore
+		createEcoreAnnotations();
+		// subsets
+		createSubsetsAnnotations();
+		// http://www.eclipse.org/emf/2002/Ecore/OCL
+		createOCLAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createEcoreAnnotations() {
+		String source = "http://www.eclipse.org/emf/2002/Ecore";		
+		addAnnotation
+		  (this, 
+		   source, 
+		   new String[] {
+			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL"
+		   });																											
+	}
+
+	/**
+	 * Initializes the annotations for <b>subsets</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createSubsetsAnnotations() {
+		String source = "subsets";							
+		addAnnotation
+		  (getUmlDiagramElement_UmlModelElement(), 
+		   source, 
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/modelElement")
+		   });			
+		addAnnotation
+		  (getUmlDiagramElement_SharedUmlStyle(), 
+		   source, 
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/sharedStyle")
+		   });			
+		addAnnotation
+		  (getUmlDiagramElement_LocalUmlStyle(), 
+		   source, 
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/localStyle")
+		   });			
+		addAnnotation
+		  (getUmlDiagramElement_OwningUmlDiagramElement(), 
+		   source, 
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/owningDiagramElement")
+		   });			
+		addAnnotation
+		  (getUmlDiagramElement_OwnedUmlDiagramElement(), 
+		   source, 
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/ownedDiagramElement")
+		   });		
+		addAnnotation
+		  (getUmlDiagramElement_TargetUmlEdge(), 
+		   source, 
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/targetEdge")
+		   });		
+		addAnnotation
+		  (getUmlDiagramElement_SourceUmlEdge(), 
+		   source, 
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/sourceEdge")
+		   });											
+		addAnnotation
+		  (getUmlEdge_SourceUmlDiagramElement(), 
+		   source, 
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(DIPackage.eNS_URI).appendFragment("//Edge/sourceDiagramElement")
+		   });			
+		addAnnotation
+		  (getUmlEdge_TargetUmlDiagramElement(), 
+		   source, 
+		   new String[] {
+		   },
+		   new URI[] {
+			 URI.createURI(DIPackage.eNS_URI).appendFragment("//Edge/targetDiagramElement")
+		   });
+	}
+
+	/**
+	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected void createOCLAnnotations() {
+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";																			
+		addAnnotation
+		  (getUmlStyle__FontsizePositive__DiagnosticChain_Map(), 
+		   source, 
+		   new String[] {
+			 "body", "fontSize > 0"
+		   });										
+	}
+
+} //UMLDIPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java
new file mode 100644
index 00000000000..b59e6bc0703
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java
@@ -0,0 +1,172 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlCompartment;
+import org.eclipse.papyrus.umldi.UmlCompartmentKind;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Uml Compartment</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl#getKind <em>Kind</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
+	/**
+	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getKind()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final UmlCompartmentKind KIND_EDEFAULT = UmlCompartmentKind.ATTRIBUTES;
+
+	/**
+	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getKind()
+	 * @generated
+	 * @ordered
+	 */
+	protected UmlCompartmentKind kind = KIND_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlCompartmentImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return UMLDIPackage.Literals.UML_COMPARTMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlCompartmentKind getKind() {
+		return kind;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setKind(UmlCompartmentKind newKind) {
+		UmlCompartmentKind oldKind = kind;
+		kind = newKind == null ? KIND_EDEFAULT : newKind;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_COMPARTMENT__KIND, oldKind, kind));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case UMLDIPackage.UML_COMPARTMENT__KIND:
+				return getKind();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case UMLDIPackage.UML_COMPARTMENT__KIND:
+				setKind((UmlCompartmentKind)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_COMPARTMENT__KIND:
+				setKind(KIND_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_COMPARTMENT__KIND:
+				return kind != KIND_EDEFAULT;
+		}
+		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(" (kind: ");
+		result.append(kind);
+		result.append(')');
+		return result.toString();
+	}
+
+} //UmlCompartmentImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java
new file mode 100644
index 00000000000..a395e1cbd49
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java
@@ -0,0 +1,751 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.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;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.dd.di.DiagramElement;
+import org.eclipse.papyrus.dd.di.Edge;
+import org.eclipse.papyrus.dd.di.Style;
+
+import org.eclipse.papyrus.dd.di.impl.DiagramElementImpl;
+
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlDiagramElement;
+import org.eclipse.papyrus.umldi.UmlEdge;
+import org.eclipse.papyrus.umldi.UmlStyle;
+
+import org.eclipse.uml2.common.util.DerivedUnionEObjectEList;
+
+import org.eclipse.uml2.uml.Element;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Uml Diagram Element</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getModelElement <em>Model Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getSharedStyle <em>Shared Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getLocalStyle <em>Local Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getOwningDiagramElement <em>Owning Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getOwnedDiagramElement <em>Owned Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getTargetEdge <em>Target Edge</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getSourceEdge <em>Source Edge</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getUmlModelElement <em>Uml Model Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getSharedUmlStyle <em>Shared Uml Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getLocalUmlStyle <em>Local Uml Style</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getOwnedUmlDiagramElement <em>Owned Uml Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getTargetUmlEdge <em>Target Uml Edge</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getSourceUmlEdge <em>Source Uml Edge</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public abstract class UmlDiagramElementImpl extends DiagramElementImpl implements UmlDiagramElement {
+	/**
+	 * The cached value of the '{@link #getUmlModelElement() <em>Uml Model Element</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getUmlModelElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Element> umlModelElement;
+
+	/**
+	 * The cached value of the '{@link #getSharedUmlStyle() <em>Shared Uml Style</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSharedUmlStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected UmlStyle sharedUmlStyle;
+
+	/**
+	 * The cached value of the '{@link #getLocalUmlStyle() <em>Local Uml Style</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLocalUmlStyle()
+	 * @generated
+	 * @ordered
+	 */
+	protected UmlStyle localUmlStyle;
+
+	/**
+	 * The cached value of the '{@link #getOwnedUmlDiagramElement() <em>Owned Uml Diagram Element</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwnedUmlDiagramElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<UmlDiagramElement> ownedUmlDiagramElement;
+
+	/**
+	 * The cached value of the '{@link #getTargetUmlEdge() <em>Target Uml Edge</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTargetUmlEdge()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<UmlEdge> targetUmlEdge;
+
+	/**
+	 * The cached value of the '{@link #getSourceUmlEdge() <em>Source Uml Edge</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSourceUmlEdge()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<UmlEdge> sourceUmlEdge;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlDiagramElementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<EObject> getModelElement() {
+		return new DerivedUnionEObjectEList<EObject>(EObject.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__MODEL_ELEMENT, MODEL_ELEMENT_ESUBSETS);
+	}
+
+	/**
+	 * The array of subset feature identifiers for the '{@link #getModelElement() <em>Model Element</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getModelElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int[] MODEL_ELEMENT_ESUBSETS = new int[] {UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT};
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Style getSharedStyle() {
+		Style sharedStyle = basicGetSharedStyle();
+		return sharedStyle != null && sharedStyle.eIsProxy() ? (Style)eResolveProxy((InternalEObject)sharedStyle) : sharedStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Style basicGetSharedStyle() {
+		if (eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE)) {
+			return basicGetSharedUmlStyle();
+		}
+		return super.basicGetSharedStyle();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Style getLocalStyle() {
+		Style localStyle = basicGetLocalStyle();
+		return localStyle != null && localStyle.eIsProxy() ? (Style)eResolveProxy((InternalEObject)localStyle) : localStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Style basicGetLocalStyle() {
+		if (eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE)) {
+			return getLocalUmlStyle();
+		}
+		return super.basicGetLocalStyle();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public DiagramElement getOwningDiagramElement() {
+		DiagramElement owningDiagramElement = basicGetOwningDiagramElement();
+		return owningDiagramElement != null && owningDiagramElement.eIsProxy() ? (DiagramElement)eResolveProxy((InternalEObject)owningDiagramElement) : owningDiagramElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public DiagramElement basicGetOwningDiagramElement() {
+		UmlDiagramElement owningUmlDiagramElement = getOwningUmlDiagramElement();			
+		if (owningUmlDiagramElement != null) {
+			return owningUmlDiagramElement;
+		}
+		return super.basicGetOwningDiagramElement();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<DiagramElement> getOwnedDiagramElement() {
+		return new DerivedUnionEObjectEList<DiagramElement>(DiagramElement.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT, OWNED_DIAGRAM_ELEMENT_ESUBSETS);
+	}
+
+	/**
+	 * The array of subset feature identifiers for the '{@link #getOwnedDiagramElement() <em>Owned Diagram Element</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getOwnedDiagramElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int[] OWNED_DIAGRAM_ELEMENT_ESUBSETS = new int[] {UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT};
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Edge> getTargetEdge() {
+		return new DerivedUnionEObjectEList<Edge>(Edge.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_EDGE, TARGET_EDGE_ESUBSETS);
+	}
+
+	/**
+	 * The array of subset feature identifiers for the '{@link #getTargetEdge() <em>Target Edge</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTargetEdge()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int[] TARGET_EDGE_ESUBSETS = new int[] {UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE};
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public EList<Edge> getSourceEdge() {
+		return new DerivedUnionEObjectEList<Edge>(Edge.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_EDGE, SOURCE_EDGE_ESUBSETS);
+	}
+
+	/**
+	 * The array of subset feature identifiers for the '{@link #getSourceEdge() <em>Source Edge</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSourceEdge()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final int[] SOURCE_EDGE_ESUBSETS = new int[] {UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE};
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Element> getUmlModelElement() {
+		if (umlModelElement == null) {
+			umlModelElement = new EObjectResolvingEList<Element>(Element.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT);
+		}
+		return umlModelElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlStyle getSharedUmlStyle() {
+		if (sharedUmlStyle != null && sharedUmlStyle.eIsProxy()) {
+			InternalEObject oldSharedUmlStyle = (InternalEObject)sharedUmlStyle;
+			sharedUmlStyle = (UmlStyle)eResolveProxy(oldSharedUmlStyle);
+			if (sharedUmlStyle != oldSharedUmlStyle) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE, oldSharedUmlStyle, sharedUmlStyle));
+			}
+		}
+		return sharedUmlStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlStyle basicGetSharedUmlStyle() {
+		return sharedUmlStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSharedUmlStyle(UmlStyle newSharedUmlStyle) {
+		UmlStyle oldSharedUmlStyle = sharedUmlStyle;
+		sharedUmlStyle = newSharedUmlStyle;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE, oldSharedUmlStyle, sharedUmlStyle));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlStyle getLocalUmlStyle() {
+		return localUmlStyle;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetLocalUmlStyle(UmlStyle newLocalUmlStyle, NotificationChain msgs) {
+		UmlStyle oldLocalUmlStyle = localUmlStyle;
+		localUmlStyle = newLocalUmlStyle;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, oldLocalUmlStyle, newLocalUmlStyle);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setLocalUmlStyle(UmlStyle newLocalUmlStyle) {
+		if (newLocalUmlStyle != localUmlStyle) {
+			NotificationChain msgs = null;
+			if (localUmlStyle != null)
+				msgs = ((InternalEObject)localUmlStyle).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, null, msgs);
+			if (newLocalUmlStyle != null)
+				msgs = ((InternalEObject)newLocalUmlStyle).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, null, msgs);
+			msgs = basicSetLocalUmlStyle(newLocalUmlStyle, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, newLocalUmlStyle, newLocalUmlStyle));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlDiagramElement getOwningUmlDiagramElement() {
+		if (eContainerFeatureID() != UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT) return null;
+		return (UmlDiagramElement)eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetOwningUmlDiagramElement(UmlDiagramElement newOwningUmlDiagramElement, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject)newOwningUmlDiagramElement, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setOwningUmlDiagramElement(UmlDiagramElement newOwningUmlDiagramElement) {
+		if (newOwningUmlDiagramElement != eInternalContainer() || (eContainerFeatureID() != UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT && newOwningUmlDiagramElement != null)) {
+			if (EcoreUtil.isAncestor(this, newOwningUmlDiagramElement))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newOwningUmlDiagramElement != null)
+				msgs = ((InternalEObject)newOwningUmlDiagramElement).eInverseAdd(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UmlDiagramElement.class, msgs);
+			msgs = basicSetOwningUmlDiagramElement(newOwningUmlDiagramElement, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT, newOwningUmlDiagramElement, newOwningUmlDiagramElement));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<UmlDiagramElement> getOwnedUmlDiagramElement() {
+		if (ownedUmlDiagramElement == null) {
+			ownedUmlDiagramElement = new EObjectContainmentWithInverseEList<UmlDiagramElement>(UmlDiagramElement.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT);
+		}
+		return ownedUmlDiagramElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<UmlEdge> getTargetUmlEdge() {
+		if (targetUmlEdge == null) {
+			targetUmlEdge = new EObjectWithInverseResolvingEList<UmlEdge>(UmlEdge.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT);
+		}
+		return targetUmlEdge;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<UmlEdge> getSourceUmlEdge() {
+		if (sourceUmlEdge == null) {
+			sourceUmlEdge = new EObjectWithInverseResolvingEList<UmlEdge>(UmlEdge.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT);
+		}
+		return sourceUmlEdge;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+				if (eInternalContainer() != null)
+					msgs = eBasicRemoveFromContainer(msgs);
+				return basicSetOwningUmlDiagramElement((UmlDiagramElement)otherEnd, msgs);
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getOwnedUmlDiagramElement()).basicAdd(otherEnd, msgs);
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getTargetUmlEdge()).basicAdd(otherEnd, msgs);
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getSourceUmlEdge()).basicAdd(otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
+				return basicSetLocalUmlStyle(null, msgs);
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+				return basicSetOwningUmlDiagramElement(null, msgs);
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+				return ((InternalEList<?>)getOwnedUmlDiagramElement()).basicRemove(otherEnd, msgs);
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
+				return ((InternalEList<?>)getTargetUmlEdge()).basicRemove(otherEnd, msgs);
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
+				return ((InternalEList<?>)getSourceUmlEdge()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+				return eInternalContainer().eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UmlDiagramElement.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
+				return getUmlModelElement();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
+				if (resolve) return getSharedUmlStyle();
+				return basicGetSharedUmlStyle();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
+				return getLocalUmlStyle();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+				return getOwningUmlDiagramElement();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+				return getOwnedUmlDiagramElement();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
+				return getTargetUmlEdge();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
+				return getSourceUmlEdge();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
+				getUmlModelElement().clear();
+				getUmlModelElement().addAll((Collection<? extends Element>)newValue);
+				return;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
+				setSharedUmlStyle((UmlStyle)newValue);
+				return;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
+				setLocalUmlStyle((UmlStyle)newValue);
+				return;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+				setOwningUmlDiagramElement((UmlDiagramElement)newValue);
+				return;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+				getOwnedUmlDiagramElement().clear();
+				getOwnedUmlDiagramElement().addAll((Collection<? extends UmlDiagramElement>)newValue);
+				return;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
+				getTargetUmlEdge().clear();
+				getTargetUmlEdge().addAll((Collection<? extends UmlEdge>)newValue);
+				return;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
+				getSourceUmlEdge().clear();
+				getSourceUmlEdge().addAll((Collection<? extends UmlEdge>)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
+				getUmlModelElement().clear();
+				return;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
+				setSharedUmlStyle((UmlStyle)null);
+				return;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
+				setLocalUmlStyle((UmlStyle)null);
+				return;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+				setOwningUmlDiagramElement((UmlDiagramElement)null);
+				return;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+				getOwnedUmlDiagramElement().clear();
+				return;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
+				getTargetUmlEdge().clear();
+				return;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
+				getSourceUmlEdge().clear();
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__MODEL_ELEMENT:
+				return isSetModelElement();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_STYLE:
+				return isSetSharedStyle();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_STYLE:
+				return isSetLocalStyle();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT:
+				return isSetOwningDiagramElement();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT:
+				return isSetOwnedDiagramElement();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_EDGE:
+				return isSetTargetEdge();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_EDGE:
+				return isSetSourceEdge();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
+				return umlModelElement != null && !umlModelElement.isEmpty();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
+				return sharedUmlStyle != null;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
+				return localUmlStyle != null;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+				return getOwningUmlDiagramElement() != null;
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+				return ownedUmlDiagramElement != null && !ownedUmlDiagramElement.isEmpty();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
+				return targetUmlEdge != null && !targetUmlEdge.isEmpty();
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
+				return sourceUmlEdge != null && !sourceUmlEdge.isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSetModelElement() {
+		return super.isSetModelElement()
+			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSetSharedStyle() {
+		return super.isSetSharedStyle()
+			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSetLocalStyle() {
+		return super.isSetLocalStyle()
+			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSetOwningDiagramElement() {
+		return super.isSetOwningDiagramElement()
+			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSetOwnedDiagramElement() {
+		return super.isSetOwnedDiagramElement()
+			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSetTargetEdge() {
+		return super.isSetTargetEdge()
+			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean isSetSourceEdge() {
+		return super.isSetSourceEdge()
+			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE);
+	}
+
+} //UmlDiagramElementImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java
new file mode 100644
index 00000000000..e2594f6326b
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java
@@ -0,0 +1,314 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.papyrus.dd.di.DIPackage;
+import org.eclipse.papyrus.dd.di.Diagram;
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlDiagram;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Uml Diagram</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getDocumentation <em>Documentation</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getResolution <em>Resolution</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
+	/**
+	 * 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 = "";
+
+	/**
+	 * 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 #getDocumentation() <em>Documentation</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDocumentation()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DOCUMENTATION_EDEFAULT = "";
+
+	/**
+	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getDocumentation()
+	 * @generated
+	 * @ordered
+	 */
+	protected String documentation = DOCUMENTATION_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getResolution() <em>Resolution</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getResolution()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double RESOLUTION_EDEFAULT = 300.0;
+
+	/**
+	 * The cached value of the '{@link #getResolution() <em>Resolution</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getResolution()
+	 * @generated
+	 * @ordered
+	 */
+	protected double resolution = RESOLUTION_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlDiagramImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return UMLDIPackage.Literals.UML_DIAGRAM;
+	}
+
+	/**
+	 * <!-- 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, UMLDIPackage.UML_DIAGRAM__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getDocumentation() {
+		return documentation;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setDocumentation(String newDocumentation) {
+		String oldDocumentation = documentation;
+		documentation = newDocumentation;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM__DOCUMENTATION, oldDocumentation, documentation));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public double getResolution() {
+		return resolution;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setResolution(double newResolution) {
+		double oldResolution = resolution;
+		resolution = newResolution;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM__RESOLUTION, oldResolution, resolution));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case UMLDIPackage.UML_DIAGRAM__NAME:
+				return getName();
+			case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
+				return getDocumentation();
+			case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
+				return getResolution();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case UMLDIPackage.UML_DIAGRAM__NAME:
+				setName((String)newValue);
+				return;
+			case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
+				setDocumentation((String)newValue);
+				return;
+			case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
+				setResolution((Double)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_DIAGRAM__NAME:
+				setName(NAME_EDEFAULT);
+				return;
+			case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
+				setDocumentation(DOCUMENTATION_EDEFAULT);
+				return;
+			case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
+				setResolution(RESOLUTION_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_DIAGRAM__NAME:
+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+			case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
+				return DOCUMENTATION_EDEFAULT == null ? documentation != null : !DOCUMENTATION_EDEFAULT.equals(documentation);
+			case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
+				return resolution != RESOLUTION_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == Diagram.class) {
+			switch (derivedFeatureID) {
+				case UMLDIPackage.UML_DIAGRAM__NAME: return DIPackage.DIAGRAM__NAME;
+				case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION: return DIPackage.DIAGRAM__DOCUMENTATION;
+				case UMLDIPackage.UML_DIAGRAM__RESOLUTION: return DIPackage.DIAGRAM__RESOLUTION;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == Diagram.class) {
+			switch (baseFeatureID) {
+				case DIPackage.DIAGRAM__NAME: return UMLDIPackage.UML_DIAGRAM__NAME;
+				case DIPackage.DIAGRAM__DOCUMENTATION: return UMLDIPackage.UML_DIAGRAM__DOCUMENTATION;
+				case DIPackage.DIAGRAM__RESOLUTION: return UMLDIPackage.UML_DIAGRAM__RESOLUTION;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- 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(", documentation: ");
+		result.append(documentation);
+		result.append(", resolution: ");
+		result.append(resolution);
+		result.append(')');
+		return result.toString();
+	}
+
+} //UmlDiagramImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java
new file mode 100644
index 00000000000..3fb49b71f6c
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java
@@ -0,0 +1,466 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.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;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+import org.eclipse.papyrus.dd.dc.Point;
+
+import org.eclipse.papyrus.dd.di.DIPackage;
+import org.eclipse.papyrus.dd.di.DiagramElement;
+import org.eclipse.papyrus.dd.di.Edge;
+
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlDiagramElement;
+import org.eclipse.papyrus.umldi.UmlEdge;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Uml Edge</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getSourceDiagramElement <em>Source Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getTargetDiagramElement <em>Target Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getWaypoint <em>Waypoint</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getSourceUmlDiagramElement <em>Source Uml Diagram Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getTargetUmlDiagramElement <em>Target Uml Diagram Element</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
+	/**
+	 * The cached value of the '{@link #getWaypoint() <em>Waypoint</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getWaypoint()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<Point> waypoint;
+
+	/**
+	 * The cached value of the '{@link #getSourceUmlDiagramElement() <em>Source Uml Diagram Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getSourceUmlDiagramElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected UmlDiagramElement sourceUmlDiagramElement;
+
+	/**
+	 * The cached value of the '{@link #getTargetUmlDiagramElement() <em>Target Uml Diagram Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getTargetUmlDiagramElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected UmlDiagramElement targetUmlDiagramElement;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlEdgeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return UMLDIPackage.Literals.UML_EDGE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramElement getSourceDiagramElement() {
+		DiagramElement sourceDiagramElement = basicGetSourceDiagramElement();
+		return sourceDiagramElement != null && sourceDiagramElement.eIsProxy() ? (DiagramElement)eResolveProxy((InternalEObject)sourceDiagramElement) : sourceDiagramElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramElement basicGetSourceDiagramElement() {
+		if (eIsSet(UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT)) {
+			return basicGetSourceUmlDiagramElement();
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramElement getTargetDiagramElement() {
+		DiagramElement targetDiagramElement = basicGetTargetDiagramElement();
+		return targetDiagramElement != null && targetDiagramElement.eIsProxy() ? (DiagramElement)eResolveProxy((InternalEObject)targetDiagramElement) : targetDiagramElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DiagramElement basicGetTargetDiagramElement() {
+		if (eIsSet(UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT)) {
+			return basicGetTargetUmlDiagramElement();
+		}
+		return null;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<Point> getWaypoint() {
+		if (waypoint == null) {
+			waypoint = new EObjectContainmentEList<Point>(Point.class, this, UMLDIPackage.UML_EDGE__WAYPOINT);
+		}
+		return waypoint;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlDiagramElement getSourceUmlDiagramElement() {
+		if (sourceUmlDiagramElement != null && sourceUmlDiagramElement.eIsProxy()) {
+			InternalEObject oldSourceUmlDiagramElement = (InternalEObject)sourceUmlDiagramElement;
+			sourceUmlDiagramElement = (UmlDiagramElement)eResolveProxy(oldSourceUmlDiagramElement);
+			if (sourceUmlDiagramElement != oldSourceUmlDiagramElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, oldSourceUmlDiagramElement, sourceUmlDiagramElement));
+			}
+		}
+		return sourceUmlDiagramElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlDiagramElement basicGetSourceUmlDiagramElement() {
+		return sourceUmlDiagramElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetSourceUmlDiagramElement(UmlDiagramElement newSourceUmlDiagramElement, NotificationChain msgs) {
+		UmlDiagramElement oldSourceUmlDiagramElement = sourceUmlDiagramElement;
+		sourceUmlDiagramElement = newSourceUmlDiagramElement;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, oldSourceUmlDiagramElement, newSourceUmlDiagramElement);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setSourceUmlDiagramElement(UmlDiagramElement newSourceUmlDiagramElement) {
+		if (newSourceUmlDiagramElement != sourceUmlDiagramElement) {
+			NotificationChain msgs = null;
+			if (sourceUmlDiagramElement != null)
+				msgs = ((InternalEObject)sourceUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
+			if (newSourceUmlDiagramElement != null)
+				msgs = ((InternalEObject)newSourceUmlDiagramElement).eInverseAdd(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
+			msgs = basicSetSourceUmlDiagramElement(newSourceUmlDiagramElement, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, newSourceUmlDiagramElement, newSourceUmlDiagramElement));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlDiagramElement getTargetUmlDiagramElement() {
+		if (targetUmlDiagramElement != null && targetUmlDiagramElement.eIsProxy()) {
+			InternalEObject oldTargetUmlDiagramElement = (InternalEObject)targetUmlDiagramElement;
+			targetUmlDiagramElement = (UmlDiagramElement)eResolveProxy(oldTargetUmlDiagramElement);
+			if (targetUmlDiagramElement != oldTargetUmlDiagramElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, oldTargetUmlDiagramElement, targetUmlDiagramElement));
+			}
+		}
+		return targetUmlDiagramElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlDiagramElement basicGetTargetUmlDiagramElement() {
+		return targetUmlDiagramElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetTargetUmlDiagramElement(UmlDiagramElement newTargetUmlDiagramElement, NotificationChain msgs) {
+		UmlDiagramElement oldTargetUmlDiagramElement = targetUmlDiagramElement;
+		targetUmlDiagramElement = newTargetUmlDiagramElement;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, oldTargetUmlDiagramElement, newTargetUmlDiagramElement);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setTargetUmlDiagramElement(UmlDiagramElement newTargetUmlDiagramElement) {
+		if (newTargetUmlDiagramElement != targetUmlDiagramElement) {
+			NotificationChain msgs = null;
+			if (targetUmlDiagramElement != null)
+				msgs = ((InternalEObject)targetUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
+			if (newTargetUmlDiagramElement != null)
+				msgs = ((InternalEObject)newTargetUmlDiagramElement).eInverseAdd(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
+			msgs = basicSetTargetUmlDiagramElement(newTargetUmlDiagramElement, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, newTargetUmlDiagramElement, newTargetUmlDiagramElement));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+				if (sourceUmlDiagramElement != null)
+					msgs = ((InternalEObject)sourceUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
+				return basicSetSourceUmlDiagramElement((UmlDiagramElement)otherEnd, msgs);
+			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+				if (targetUmlDiagramElement != null)
+					msgs = ((InternalEObject)targetUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
+				return basicSetTargetUmlDiagramElement((UmlDiagramElement)otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case UMLDIPackage.UML_EDGE__WAYPOINT:
+				return ((InternalEList<?>)getWaypoint()).basicRemove(otherEnd, msgs);
+			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+				return basicSetSourceUmlDiagramElement(null, msgs);
+			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+				return basicSetTargetUmlDiagramElement(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT:
+				if (resolve) return getSourceDiagramElement();
+				return basicGetSourceDiagramElement();
+			case UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT:
+				if (resolve) return getTargetDiagramElement();
+				return basicGetTargetDiagramElement();
+			case UMLDIPackage.UML_EDGE__WAYPOINT:
+				return getWaypoint();
+			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+				if (resolve) return getSourceUmlDiagramElement();
+				return basicGetSourceUmlDiagramElement();
+			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+				if (resolve) return getTargetUmlDiagramElement();
+				return basicGetTargetUmlDiagramElement();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case UMLDIPackage.UML_EDGE__WAYPOINT:
+				getWaypoint().clear();
+				getWaypoint().addAll((Collection<? extends Point>)newValue);
+				return;
+			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+				setSourceUmlDiagramElement((UmlDiagramElement)newValue);
+				return;
+			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+				setTargetUmlDiagramElement((UmlDiagramElement)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_EDGE__WAYPOINT:
+				getWaypoint().clear();
+				return;
+			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+				setSourceUmlDiagramElement((UmlDiagramElement)null);
+				return;
+			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+				setTargetUmlDiagramElement((UmlDiagramElement)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT:
+				return isSetSourceDiagramElement();
+			case UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT:
+				return isSetTargetDiagramElement();
+			case UMLDIPackage.UML_EDGE__WAYPOINT:
+				return waypoint != null && !waypoint.isEmpty();
+			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+				return sourceUmlDiagramElement != null;
+			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+				return targetUmlDiagramElement != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == Edge.class) {
+			switch (derivedFeatureID) {
+				case UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT: return DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT;
+				case UMLDIPackage.UML_EDGE__WAYPOINT: return DIPackage.EDGE__WAYPOINT;
+				case UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT: return DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == Edge.class) {
+			switch (baseFeatureID) {
+				case DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT: return UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT;
+				case DIPackage.EDGE__WAYPOINT: return UMLDIPackage.UML_EDGE__WAYPOINT;
+				case DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT: return UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetSourceDiagramElement() {
+		return eIsSet(UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isSetTargetDiagramElement() {
+		return eIsSet(UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT);
+	}
+
+} //UmlEdgeImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java
new file mode 100644
index 00000000000..4484631af12
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java
@@ -0,0 +1,172 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlLabel;
+import org.eclipse.papyrus.umldi.UmlLabelKind;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Uml Label</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlLabelImpl#getKind <em>Kind</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
+	/**
+	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getKind()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final UmlLabelKind KIND_EDEFAULT = UmlLabelKind.NAME;
+
+	/**
+	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getKind()
+	 * @generated
+	 * @ordered
+	 */
+	protected UmlLabelKind kind = KIND_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlLabelImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return UMLDIPackage.Literals.UML_LABEL;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UmlLabelKind getKind() {
+		return kind;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setKind(UmlLabelKind newKind) {
+		UmlLabelKind oldKind = kind;
+		kind = newKind == null ? KIND_EDEFAULT : newKind;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_LABEL__KIND, oldKind, kind));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case UMLDIPackage.UML_LABEL__KIND:
+				return getKind();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case UMLDIPackage.UML_LABEL__KIND:
+				setKind((UmlLabelKind)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_LABEL__KIND:
+				setKind(KIND_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_LABEL__KIND:
+				return kind != KIND_EDEFAULT;
+		}
+		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(" (kind: ");
+		result.append(kind);
+		result.append(')');
+		return result.toString();
+	}
+
+} //UmlLabelImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java
new file mode 100644
index 00000000000..e058fdec4a8
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java
@@ -0,0 +1,220 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.dd.dc.Bounds;
+
+import org.eclipse.papyrus.dd.di.DIPackage;
+import org.eclipse.papyrus.dd.di.Shape;
+
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlShape;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Uml Shape</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlShapeImpl#getBounds <em>Bounds</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
+	/**
+	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getBounds()
+	 * @generated
+	 * @ordered
+	 */
+	protected Bounds bounds;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlShapeImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return UMLDIPackage.Literals.UML_SHAPE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public Bounds getBounds() {
+		return bounds;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
+		Bounds oldBounds = bounds;
+		bounds = newBounds;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_SHAPE__BOUNDS, oldBounds, newBounds);
+			if (msgs == null) msgs = notification; else msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setBounds(Bounds newBounds) {
+		if (newBounds != bounds) {
+			NotificationChain msgs = null;
+			if (bounds != null)
+				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_SHAPE__BOUNDS, null, msgs);
+			if (newBounds != null)
+				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_SHAPE__BOUNDS, null, msgs);
+			msgs = basicSetBounds(newBounds, msgs);
+			if (msgs != null) msgs.dispatch();
+		}
+		else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_SHAPE__BOUNDS, newBounds, newBounds));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+			case UMLDIPackage.UML_SHAPE__BOUNDS:
+				return basicSetBounds(null, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case UMLDIPackage.UML_SHAPE__BOUNDS:
+				return getBounds();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case UMLDIPackage.UML_SHAPE__BOUNDS:
+				setBounds((Bounds)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_SHAPE__BOUNDS:
+				setBounds((Bounds)null);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_SHAPE__BOUNDS:
+				return bounds != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
+		if (baseClass == Shape.class) {
+			switch (derivedFeatureID) {
+				case UMLDIPackage.UML_SHAPE__BOUNDS: return DIPackage.SHAPE__BOUNDS;
+				default: return -1;
+			}
+		}
+		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
+		if (baseClass == Shape.class) {
+			switch (baseFeatureID) {
+				case DIPackage.SHAPE__BOUNDS: return UMLDIPackage.UML_SHAPE__BOUNDS;
+				default: return -1;
+			}
+		}
+		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+	}
+
+} //UmlShapeImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java
new file mode 100644
index 00000000000..06c241ea6b5
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java
@@ -0,0 +1,282 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.impl;
+
+import java.lang.reflect.InvocationTargetException;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+
+import org.eclipse.papyrus.dd.di.impl.StyleImpl;
+
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlStyle;
+
+import org.eclipse.papyrus.umldi.util.UMLDIValidator;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Uml Style</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlStyleImpl#getFontName <em>Font Name</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlStyleImpl#getFontSize <em>Font Size</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class UmlStyleImpl extends StyleImpl implements UmlStyle {
+	/**
+	 * The default value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FONT_NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String fontName = FONT_NAME_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getFontSize() <em>Font Size</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontSize()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final double FONT_SIZE_EDEFAULT = 0.0;
+
+	/**
+	 * The cached value of the '{@link #getFontSize() <em>Font Size</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getFontSize()
+	 * @generated
+	 * @ordered
+	 */
+	protected double fontSize = FONT_SIZE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UmlStyleImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return UMLDIPackage.Literals.UML_STYLE;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public String getFontName() {
+		return fontName;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFontName(String newFontName) {
+		String oldFontName = fontName;
+		fontName = newFontName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_STYLE__FONT_NAME, oldFontName, fontName));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public double getFontSize() {
+		return fontSize;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setFontSize(double newFontSize) {
+		double oldFontSize = fontSize;
+		fontSize = newFontSize;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_STYLE__FONT_SIZE, oldFontSize, fontSize));
+	}
+
+	/**
+	 * The cached validation expression for the '{@link #fontsizePositive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Fontsize Positive</em>}' invariant operation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #fontsizePositive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String FONTSIZE_POSITIVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION = "fontSize > 0";
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean fontsizePositive(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return
+			UMLDIValidator.validate
+				(UMLDIPackage.Literals.UML_STYLE,
+				 this,
+				 diagnostics,
+				 context,
+				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
+				 UMLDIPackage.Literals.UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP,
+				 FONTSIZE_POSITIVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
+				 Diagnostic.ERROR,
+				 UMLDIValidator.DIAGNOSTIC_SOURCE,
+				 UMLDIValidator.UML_STYLE__FONTSIZE_POSITIVE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+			case UMLDIPackage.UML_STYLE__FONT_NAME:
+				return getFontName();
+			case UMLDIPackage.UML_STYLE__FONT_SIZE:
+				return getFontSize();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+			case UMLDIPackage.UML_STYLE__FONT_NAME:
+				setFontName((String)newValue);
+				return;
+			case UMLDIPackage.UML_STYLE__FONT_SIZE:
+				setFontSize((Double)newValue);
+				return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_STYLE__FONT_NAME:
+				setFontName(FONT_NAME_EDEFAULT);
+				return;
+			case UMLDIPackage.UML_STYLE__FONT_SIZE:
+				setFontSize(FONT_SIZE_EDEFAULT);
+				return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+			case UMLDIPackage.UML_STYLE__FONT_NAME:
+				return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);
+			case UMLDIPackage.UML_STYLE__FONT_SIZE:
+				return fontSize != FONT_SIZE_EDEFAULT;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	@SuppressWarnings("unchecked")
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch (operationID) {
+			case UMLDIPackage.UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP:
+				return fontsizePositive((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		}
+		return super.eInvoke(operationID, arguments);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy()) return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (fontName: ");
+		result.append(fontName);
+		result.append(", fontSize: ");
+		result.append(fontSize);
+		result.append(')');
+		return result.toString();
+	}
+
+} //UmlStyleImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java
new file mode 100644
index 00000000000..d9d5e21fa65
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java
@@ -0,0 +1,333 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.util;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.papyrus.dd.di.Diagram;
+import org.eclipse.papyrus.dd.di.DiagramElement;
+import org.eclipse.papyrus.dd.di.Edge;
+import org.eclipse.papyrus.dd.di.Shape;
+import org.eclipse.papyrus.dd.di.Style;
+
+import org.eclipse.papyrus.umldi.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage
+ * @generated
+ */
+public class UMLDIAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static UMLDIPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDIAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = UMLDIPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
+	 * <!-- end-user-doc -->
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject)object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected UMLDISwitch<Adapter> modelSwitch =
+		new UMLDISwitch<Adapter>() {
+			@Override
+			public Adapter caseUmlDiagram(UmlDiagram object) {
+				return createUmlDiagramAdapter();
+			}
+			@Override
+			public Adapter caseUmlShape(UmlShape object) {
+				return createUmlShapeAdapter();
+			}
+			@Override
+			public Adapter caseUmlDiagramElement(UmlDiagramElement object) {
+				return createUmlDiagramElementAdapter();
+			}
+			@Override
+			public Adapter caseUmlStyle(UmlStyle object) {
+				return createUmlStyleAdapter();
+			}
+			@Override
+			public Adapter caseUmlEdge(UmlEdge object) {
+				return createUmlEdgeAdapter();
+			}
+			@Override
+			public Adapter caseUmlCompartment(UmlCompartment object) {
+				return createUmlCompartmentAdapter();
+			}
+			@Override
+			public Adapter caseUmlLabel(UmlLabel object) {
+				return createUmlLabelAdapter();
+			}
+			@Override
+			public Adapter caseDiagramElement(DiagramElement object) {
+				return createDiagramElementAdapter();
+			}
+			@Override
+			public Adapter caseShape(Shape object) {
+				return createShapeAdapter();
+			}
+			@Override
+			public Adapter caseDiagram(Diagram object) {
+				return createDiagramAdapter();
+			}
+			@Override
+			public Adapter caseStyle(Style object) {
+				return createStyleAdapter();
+			}
+			@Override
+			public Adapter caseEdge(Edge object) {
+				return createEdgeAdapter();
+			}
+			@Override
+			public Adapter defaultCase(EObject object) {
+				return createEObjectAdapter();
+			}
+		};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject)target);
+	}
+
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.umldi.UmlDiagram <em>Uml Diagram</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.umldi.UmlDiagram
+	 * @generated
+	 */
+	public Adapter createUmlDiagramAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.umldi.UmlDiagramElement <em>Uml Diagram Element</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.umldi.UmlDiagramElement
+	 * @generated
+	 */
+	public Adapter createUmlDiagramElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.umldi.UmlStyle <em>Uml Style</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.umldi.UmlStyle
+	 * @generated
+	 */
+	public Adapter createUmlStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.umldi.UmlEdge <em>Uml Edge</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.umldi.UmlEdge
+	 * @generated
+	 */
+	public Adapter createUmlEdgeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.umldi.UmlCompartment <em>Uml Compartment</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.umldi.UmlCompartment
+	 * @generated
+	 */
+	public Adapter createUmlCompartmentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.umldi.UmlLabel <em>Uml Label</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.umldi.UmlLabel
+	 * @generated
+	 */
+	public Adapter createUmlLabelAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.umldi.UmlShape <em>Uml Shape</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.umldi.UmlShape
+	 * @generated
+	 */
+	public Adapter createUmlShapeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.di.DiagramElement <em>Diagram Element</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.dd.di.DiagramElement
+	 * @generated
+	 */
+	public Adapter createDiagramElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.di.Shape <em>Shape</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.dd.di.Shape
+	 * @generated
+	 */
+	public Adapter createShapeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.di.Diagram <em>Diagram</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.dd.di.Diagram
+	 * @generated
+	 */
+	public Adapter createDiagramAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.di.Style <em>Style</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.dd.di.Style
+	 * @generated
+	 */
+	public Adapter createStyleAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.dd.di.Edge <em>Edge</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.dd.di.Edge
+	 * @generated
+	 */
+	public Adapter createEdgeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} //UMLDIAdapterFactory
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java
new file mode 100644
index 00000000000..256e057d8ef
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java
@@ -0,0 +1,293 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.util;
+
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.notify.impl.AdapterImpl;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+
+import org.eclipse.papyrus.dd.di.DIPackage;
+
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+import org.eclipse.papyrus.umldi.UmlCompartment;
+import org.eclipse.papyrus.umldi.UmlDiagram;
+import org.eclipse.papyrus.umldi.UmlEdge;
+import org.eclipse.papyrus.umldi.UmlLabel;
+import org.eclipse.papyrus.umldi.UmlShape;
+
+/**
+ * <!-- begin-user-doc -->
+ * An adapter that propagates notifications for derived unions.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage
+ * @generated
+ */
+public class UMLDIDerivedUnionAdapter extends AdapterImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static UMLDIPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDIDerivedUnionAdapter() {
+		if (modelPackage == null) {
+			modelPackage = UMLDIPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Calls <code>notifyChanged</code> with the appropriate model class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification) {
+		Object notifier = notification.getNotifier();
+		if (notifier instanceof EObject) {
+			EClass eClass = ((EObject)notifier).eClass();
+			if (eClass.eContainer() == modelPackage) {
+				notifyChanged(notification, eClass);
+			}
+		}
+	}
+
+	/**
+	 * Calls <code>notifyXXXChanged</code> for the corresponding class of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @param eClass the Ecore class of the notifier.
+	 * @generated
+	 */
+	protected void notifyChanged(Notification notification, EClass eClass) {
+		switch (eClass.getClassifierID()) {
+			case UMLDIPackage.UML_DIAGRAM:
+				notifyUmlDiagramChanged(notification, eClass);
+				break;
+			case UMLDIPackage.UML_SHAPE:
+				notifyUmlShapeChanged(notification, eClass);
+				break;
+			case UMLDIPackage.UML_EDGE:
+				notifyUmlEdgeChanged(notification, eClass);
+				break;
+			case UMLDIPackage.UML_COMPARTMENT:
+				notifyUmlCompartmentChanged(notification, eClass);
+				break;
+			case UMLDIPackage.UML_LABEL:
+				notifyUmlLabelChanged(notification, eClass);
+				break;
+		}
+	}
+
+	/**
+	 * Does nothing; clients may override so that it does something.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @param eClass the Ecore class of the notifier.
+	 * @param derivedUnion the derived union affected by the change.
+	 * @generated
+	 */
+	public void notifyChanged(Notification notification, EClass eClass, EStructuralFeature derivedUnion) {
+		// Do nothing.
+	}
+
+	/**
+	 * Calls <code>notifyChanged</code> for each affected derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @param eClass the Ecore class of the notifier.
+	 * @generated
+	 */
+	protected void notifyUmlDiagramChanged(Notification notification, EClass eClass) {
+		switch (notification.getFeatureID(UmlDiagram.class)) {
+			case UMLDIPackage.UML_DIAGRAM__UML_MODEL_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
+				break;
+			case UMLDIPackage.UML_DIAGRAM__SHARED_UML_STYLE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
+				break;
+			case UMLDIPackage.UML_DIAGRAM__LOCAL_UML_STYLE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
+				break;
+			case UMLDIPackage.UML_DIAGRAM__OWNING_UML_DIAGRAM_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
+				break;
+			case UMLDIPackage.UML_DIAGRAM__OWNED_UML_DIAGRAM_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
+				break;
+			case UMLDIPackage.UML_DIAGRAM__TARGET_UML_EDGE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
+				break;
+			case UMLDIPackage.UML_DIAGRAM__SOURCE_UML_EDGE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
+				break;
+		}
+	}
+
+	/**
+	 * Calls <code>notifyChanged</code> for each affected derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @param eClass the Ecore class of the notifier.
+	 * @generated
+	 */
+	protected void notifyUmlEdgeChanged(Notification notification, EClass eClass) {
+		switch (notification.getFeatureID(UmlEdge.class)) {
+			case UMLDIPackage.UML_EDGE__UML_MODEL_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
+				break;
+			case UMLDIPackage.UML_EDGE__SHARED_UML_STYLE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
+				break;
+			case UMLDIPackage.UML_EDGE__LOCAL_UML_STYLE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
+				break;
+			case UMLDIPackage.UML_EDGE__OWNING_UML_DIAGRAM_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
+				break;
+			case UMLDIPackage.UML_EDGE__OWNED_UML_DIAGRAM_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
+				break;
+			case UMLDIPackage.UML_EDGE__TARGET_UML_EDGE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
+				break;
+			case UMLDIPackage.UML_EDGE__SOURCE_UML_EDGE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
+				break;
+			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.EDGE__SOURCE_DIAGRAM_ELEMENT);
+				break;
+			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.EDGE__TARGET_DIAGRAM_ELEMENT);
+				break;
+		}
+	}
+
+	/**
+	 * Calls <code>notifyChanged</code> for each affected derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @param eClass the Ecore class of the notifier.
+	 * @generated
+	 */
+	protected void notifyUmlCompartmentChanged(Notification notification, EClass eClass) {
+		switch (notification.getFeatureID(UmlCompartment.class)) {
+			case UMLDIPackage.UML_COMPARTMENT__UML_MODEL_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
+				break;
+			case UMLDIPackage.UML_COMPARTMENT__SHARED_UML_STYLE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
+				break;
+			case UMLDIPackage.UML_COMPARTMENT__LOCAL_UML_STYLE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
+				break;
+			case UMLDIPackage.UML_COMPARTMENT__OWNING_UML_DIAGRAM_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
+				break;
+			case UMLDIPackage.UML_COMPARTMENT__OWNED_UML_DIAGRAM_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
+				break;
+			case UMLDIPackage.UML_COMPARTMENT__TARGET_UML_EDGE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
+				break;
+			case UMLDIPackage.UML_COMPARTMENT__SOURCE_UML_EDGE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
+				break;
+		}
+	}
+
+	/**
+	 * Calls <code>notifyChanged</code> for each affected derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @param eClass the Ecore class of the notifier.
+	 * @generated
+	 */
+	protected void notifyUmlLabelChanged(Notification notification, EClass eClass) {
+		switch (notification.getFeatureID(UmlLabel.class)) {
+			case UMLDIPackage.UML_LABEL__UML_MODEL_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
+				break;
+			case UMLDIPackage.UML_LABEL__SHARED_UML_STYLE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
+				break;
+			case UMLDIPackage.UML_LABEL__LOCAL_UML_STYLE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
+				break;
+			case UMLDIPackage.UML_LABEL__OWNING_UML_DIAGRAM_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
+				break;
+			case UMLDIPackage.UML_LABEL__OWNED_UML_DIAGRAM_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
+				break;
+			case UMLDIPackage.UML_LABEL__TARGET_UML_EDGE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
+				break;
+			case UMLDIPackage.UML_LABEL__SOURCE_UML_EDGE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
+				break;
+		}
+	}
+
+	/**
+	 * Calls <code>notifyChanged</code> for each affected derived union.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param notification a description of the change.
+	 * @param eClass the Ecore class of the notifier.
+	 * @generated
+	 */
+	protected void notifyUmlShapeChanged(Notification notification, EClass eClass) {
+		switch (notification.getFeatureID(UmlShape.class)) {
+			case UMLDIPackage.UML_SHAPE__UML_MODEL_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
+				break;
+			case UMLDIPackage.UML_SHAPE__SHARED_UML_STYLE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
+				break;
+			case UMLDIPackage.UML_SHAPE__LOCAL_UML_STYLE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
+				break;
+			case UMLDIPackage.UML_SHAPE__OWNING_UML_DIAGRAM_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
+				break;
+			case UMLDIPackage.UML_SHAPE__OWNED_UML_DIAGRAM_ELEMENT:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
+				break;
+			case UMLDIPackage.UML_SHAPE__TARGET_UML_EDGE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
+				break;
+			case UMLDIPackage.UML_SHAPE__SOURCE_UML_EDGE:
+				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
+				break;
+		}
+	}
+
+} //UMLDIDerivedUnionAdapter
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java
new file mode 100644
index 00000000000..858cc9f23eb
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
+
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource Factory</b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.umldi.util.UMLDIResourceImpl
+ * @generated
+ */
+public class UMLDIResourceFactoryImpl extends ResourceFactoryImpl {
+	/**
+	 * Creates an instance of the resource factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDIResourceFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Resource createResource(URI uri) {
+		XMLResource result = new UMLDIResourceImpl(uri);
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
+
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
+
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
+		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
+
+		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
+		return result;
+	}
+
+} //UMLDIResourceFactoryImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java
new file mode 100644
index 00000000000..c8f7f9d108c
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.util;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Resource </b> associated with the package.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.umldi.util.UMLDIResourceFactoryImpl
+ * @generated
+ */
+public class UMLDIResourceImpl extends XMLResourceImpl {
+	/**
+	 * Creates an instance of the resource.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @param uri the URI of the new resource.
+	 * @generated
+	 */
+	public UMLDIResourceImpl(URI uri) {
+		super(uri);
+	}
+
+} //UMLDIResourceImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java
new file mode 100644
index 00000000000..bf214bba8c3
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java
@@ -0,0 +1,347 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.Switch;
+
+import org.eclipse.papyrus.dd.di.Diagram;
+import org.eclipse.papyrus.dd.di.DiagramElement;
+import org.eclipse.papyrus.dd.di.Edge;
+import org.eclipse.papyrus.dd.di.Shape;
+import org.eclipse.papyrus.dd.di.Style;
+
+import org.eclipse.papyrus.umldi.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
+ * to invoke the <code>caseXXX</code> method for each class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage
+ * @generated
+ */
+public class UMLDISwitch<T> extends Switch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static UMLDIPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDISwitch() {
+		if (modelPackage == null) {
+			modelPackage = UMLDIPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Checks whether this is a switch for the given package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @parameter ePackage the package in question.
+	 * @return whether this is a switch for the given package.
+	 * @generated
+	 */
+	@Override
+	protected boolean isSwitchFor(EPackage ePackage) {
+		return ePackage == modelPackage;
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	@Override
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+			case UMLDIPackage.UML_DIAGRAM: {
+				UmlDiagram umlDiagram = (UmlDiagram)theEObject;
+				T result = caseUmlDiagram(umlDiagram);
+				if (result == null) result = caseUmlShape(umlDiagram);
+				if (result == null) result = caseDiagram(umlDiagram);
+				if (result == null) result = caseUmlDiagramElement(umlDiagram);
+				if (result == null) result = caseShape(umlDiagram);
+				if (result == null) result = caseDiagramElement(umlDiagram);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UMLDIPackage.UML_SHAPE: {
+				UmlShape umlShape = (UmlShape)theEObject;
+				T result = caseUmlShape(umlShape);
+				if (result == null) result = caseUmlDiagramElement(umlShape);
+				if (result == null) result = caseShape(umlShape);
+				if (result == null) result = caseDiagramElement(umlShape);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT: {
+				UmlDiagramElement umlDiagramElement = (UmlDiagramElement)theEObject;
+				T result = caseUmlDiagramElement(umlDiagramElement);
+				if (result == null) result = caseDiagramElement(umlDiagramElement);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UMLDIPackage.UML_STYLE: {
+				UmlStyle umlStyle = (UmlStyle)theEObject;
+				T result = caseUmlStyle(umlStyle);
+				if (result == null) result = caseStyle(umlStyle);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UMLDIPackage.UML_EDGE: {
+				UmlEdge umlEdge = (UmlEdge)theEObject;
+				T result = caseUmlEdge(umlEdge);
+				if (result == null) result = caseUmlDiagramElement(umlEdge);
+				if (result == null) result = caseEdge(umlEdge);
+				if (result == null) result = caseDiagramElement(umlEdge);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UMLDIPackage.UML_COMPARTMENT: {
+				UmlCompartment umlCompartment = (UmlCompartment)theEObject;
+				T result = caseUmlCompartment(umlCompartment);
+				if (result == null) result = caseUmlShape(umlCompartment);
+				if (result == null) result = caseUmlDiagramElement(umlCompartment);
+				if (result == null) result = caseShape(umlCompartment);
+				if (result == null) result = caseDiagramElement(umlCompartment);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			case UMLDIPackage.UML_LABEL: {
+				UmlLabel umlLabel = (UmlLabel)theEObject;
+				T result = caseUmlLabel(umlLabel);
+				if (result == null) result = caseUmlShape(umlLabel);
+				if (result == null) result = caseUmlDiagramElement(umlLabel);
+				if (result == null) result = caseShape(umlLabel);
+				if (result == null) result = caseDiagramElement(umlLabel);
+				if (result == null) result = defaultCase(theEObject);
+				return result;
+			}
+			default: return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Uml Diagram</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>Uml Diagram</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUmlDiagram(UmlDiagram object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Uml Diagram Element</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>Uml Diagram Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUmlDiagramElement(UmlDiagramElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Uml Style</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>Uml Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUmlStyle(UmlStyle object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Uml Edge</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>Uml Edge</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUmlEdge(UmlEdge object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Uml Compartment</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>Uml Compartment</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUmlCompartment(UmlCompartment object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Uml Label</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>Uml Label</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUmlLabel(UmlLabel object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Uml Shape</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>Uml Shape</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseUmlShape(UmlShape object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Diagram Element</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>Diagram Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDiagramElement(DiagramElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Shape</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>Shape</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseShape(Shape object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Diagram</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>Diagram</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseDiagram(Diagram object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Style</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>Style</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStyle(Style object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Edge</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>Edge</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseEdge(Edge object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	@Override
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} //UMLDISwitch
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java
new file mode 100644
index 00000000000..f6fa6decc21
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java
@@ -0,0 +1,256 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.util.DiagnosticChain;
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EOperation;
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.util.EObjectValidator;
+
+import org.eclipse.papyrus.umldi.*;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Validator</b> for the model.
+ * <!-- end-user-doc -->
+ * @see org.eclipse.papyrus.umldi.UMLDIPackage
+ * @generated
+ */
+public class UMLDIValidator extends EObjectValidator {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final UMLDIValidator INSTANCE = new UMLDIValidator();
+
+	/**
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
+	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
+	 * @generated
+	 */
+	public static final String DIAGNOSTIC_SOURCE = "org.eclipse.papyrus.umldi";
+
+	/**
+	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Fontsize Positive' of 'Uml Style'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static final int UML_STYLE__FONTSIZE_POSITIVE = 1;
+
+	/**
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 1;
+
+	/**
+	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
+
+	/**
+	 * Delegates evaluation of the given invariant expression against the object in the given context.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public static boolean validate(EClass eClass, EObject eObject, DiagnosticChain diagnostics, Map<Object, Object> context, String validationDelegate, EOperation invariant, String expression, int severity, String source, int code) {
+		return EObjectValidator.validate(eClass, eObject, diagnostics, context, validationDelegate, invariant, expression, severity, source, code);
+	}
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDIValidator() {
+		super();
+	}
+
+	/**
+	 * Returns the package of this validator switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected EPackage getEPackage() {
+	  return UMLDIPackage.eINSTANCE;
+	}
+
+	/**
+	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		switch (classifierID) {
+			case UMLDIPackage.UML_DIAGRAM:
+				return validateUmlDiagram((UmlDiagram)value, diagnostics, context);
+			case UMLDIPackage.UML_SHAPE:
+				return validateUmlShape((UmlShape)value, diagnostics, context);
+			case UMLDIPackage.UML_DIAGRAM_ELEMENT:
+				return validateUmlDiagramElement((UmlDiagramElement)value, diagnostics, context);
+			case UMLDIPackage.UML_STYLE:
+				return validateUmlStyle((UmlStyle)value, diagnostics, context);
+			case UMLDIPackage.UML_EDGE:
+				return validateUmlEdge((UmlEdge)value, diagnostics, context);
+			case UMLDIPackage.UML_COMPARTMENT:
+				return validateUmlCompartment((UmlCompartment)value, diagnostics, context);
+			case UMLDIPackage.UML_LABEL:
+				return validateUmlLabel((UmlLabel)value, diagnostics, context);
+			case UMLDIPackage.UML_COMPARTMENT_KIND:
+				return validateUmlCompartmentKind((UmlCompartmentKind)value, diagnostics, context);
+			case UMLDIPackage.UML_LABEL_KIND:
+				return validateUmlLabelKind((UmlLabelKind)value, diagnostics, context);
+			default:
+				return true;
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateUmlDiagram(UmlDiagram umlDiagram, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(umlDiagram, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateUmlDiagramElement(UmlDiagramElement umlDiagramElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(umlDiagramElement, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateUmlStyle(UmlStyle umlStyle, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if (!validate_NoCircularContainment(umlStyle, diagnostics, context)) return false;
+		boolean result = validate_EveryMultiplicityConforms(umlStyle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(umlStyle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(umlStyle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(umlStyle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryProxyResolves(umlStyle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_UniqueID(umlStyle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryKeyUnique(umlStyle, diagnostics, context);
+		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(umlStyle, diagnostics, context);
+		if (result || diagnostics != null) result &= validateUmlStyle_fontsizePositive(umlStyle, diagnostics, context);
+		return result;
+	}
+
+	/**
+	 * Validates the fontsizePositive constraint of '<em>Uml Style</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateUmlStyle_fontsizePositive(UmlStyle umlStyle, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return umlStyle.fontsizePositive(diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateUmlEdge(UmlEdge umlEdge, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(umlEdge, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateUmlCompartment(UmlCompartment umlCompartment, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(umlCompartment, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateUmlLabel(UmlLabel umlLabel, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(umlLabel, diagnostics, context);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateUmlCompartmentKind(UmlCompartmentKind umlCompartmentKind, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateUmlLabelKind(UmlLabelKind umlLabelKind, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return true;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean validateUmlShape(UmlShape umlShape, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return validate_EveryDefaultConstraint(umlShape, diagnostics, context);
+	}
+
+	/**
+	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public ResourceLocator getResourceLocator() {
+		// TODO
+		// Specialize this to return a resource locator for messages specific to this validator.
+		// Ensure that you remove @generated or mark it @generated NOT
+		return super.getResourceLocator();
+	}
+
+} //UMLDIValidator
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java
new file mode 100644
index 00000000000..de0aa472735
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EPackage;
+
+import org.eclipse.emf.ecore.resource.Resource;
+
+import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
+
+import org.eclipse.papyrus.umldi.UMLDIPackage;
+
+/**
+ * This class contains helper methods to serialize and deserialize XML documents
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class UMLDIXMLProcessor extends XMLProcessor {
+
+	/**
+	 * Public constructor to instantiate the helper.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public UMLDIXMLProcessor() {
+		super((EPackage.Registry.INSTANCE));
+		UMLDIPackage.eINSTANCE.eClass();
+	}
+	
+	/**
+	 * Register for "*" and "xml" file extensions the UMLDIResourceFactoryImpl factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	protected Map<String, Resource.Factory> getRegistrations() {
+		if (registrations == null) {
+			super.getRegistrations();
+			registrations.put(XML_EXTENSION, new UMLDIResourceFactoryImpl());
+			registrations.put(STAR_EXTENSION, new UMLDIResourceFactoryImpl());
+		}
+		return registrations;
+	}
+
+} //UMLDIXMLProcessor
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.classpath b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.classpath
new file mode 100644
index 00000000000..3bc247511f0
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.project b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.project
new file mode 100644
index 00000000000..d2cc3465165
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.project
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.umldi2dg</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>
+			<arguments>
+				<dictionary>
+					<key>src_container</key>
+					<value>transforms</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
new file mode 100644
index 00000000000..a3eb9574eb4
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="ASCII"?>
+<uriMap:MappingContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:uriMap="http:///www.eclipse.org/m2m/qvt/oml/MModelUriMap/1.0.0">
+  <mapping sourceURI="http://www.omg.org/spec/DD/20110901/DC" targetURI="platform:/resource/org.eclipse.papyrus.dd/model/DC.ecore"/>
+  <mapping sourceURI="http://www.omg.org/spec/DD/20110901/DG" targetURI="platform:/resource/org.eclipse.papyrus.dd/model/DG.ecore"/>
+  <mapping sourceURI="http://www.omg.org/spec/DD/20110901/DI" targetURI="platform:/resource/org.eclipse.papyrus.dd/model/DI.ecore"/>
+  <mapping sourceURI="http://www.omg.org/spec/UML/20131001/UMLDI" targetURI="platform:/resource/org.eclipse.papyrus.umldi/model/UMLDI.ecore"/>
+</uriMap:MappingContainer>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/META-INF/MANIFEST.MF b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..78010d4351d
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.papyrus.umldi2dg;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: org.eclipse.m2m.qvt.oml,
+ org.eclipse.papyrus.dd;bundle-version="1.0.0"
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/build.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/build.properties
new file mode 100644
index 00000000000..b3959486182
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/build.properties
@@ -0,0 +1,18 @@
+# Copyright (c) 2014 CEA LIST.
+#  
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#  
+# Contributors:
+#  CEA LIST - Initial API and implementation
+
+bin.includes = .,\
+			   META-INF/,\
+               transforms/,\
+               plugin.xml,\
+               plugin.properties
+source.. = src/
+output.. = bin
+               
\ No newline at end of file
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.properties b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.properties
new file mode 100644
index 00000000000..9daf172639b
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.properties
@@ -0,0 +1,13 @@
+###############################################################################
+# Copyright (c) 2008, 2009 Borland Software Corporation and others.
+# 
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#   
+# Contributors:
+#     Borland Software Corporation - initial API and implementation
+###############################################################################
+pluginName=UMLDI to DG Plugin
+providerName=CEA LIST
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.xml b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.xml
new file mode 100644
index 00000000000..76a4c4fdba5
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/plugin.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+ Copyright (c) 2014 CEA LIST.
+  
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/epl-v10.html
+  
+ Contributors:
+  CEA LIST - Initial API and implementation
+-->
+
+<plugin>
+	<extension point="org.eclipse.m2m.qvt.oml.javaBlackboxUnits">
+   		<unit name="UtilitiesLibrary" namespace="org.eclipse.papyrus.umldi2dg">
+    		<library name="UtilitiesLibrary" class="org.eclipse.papyrus.umldi2dg.UtilitiesLibrary">
+    			<metamodel nsURI="http://www.omg.org/spec/DD/20110901/DC"/>
+    		</library>
+		</unit>
+	</extension>
+</plugin>
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/scripts/umllayouts.js b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/scripts/umllayouts.js
new file mode 100644
index 00000000000..500c4ac3c95
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/scripts/umllayouts.js
@@ -0,0 +1,229 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+
+function xyLayout(parent) {
+	var children = getChildren(parent);
+	var n = children.length;
+	for (var i=0; i<n; i++) {
+		var child = children[i];
+		var x = +child.getAttribute("x");
+		var y = +child.getAttribute("y");
+		var width = +child.getAttribute("width");
+		var height = +child.getAttribute("height");
+		var prefSize = getPreferredSize(child);
+		width = Math.max(width, prefSize.width);
+		height = Math.max(height, prefSize.height);
+		setBounds(child, x, y, width, height);
+	}
+}
+
+function getPreferredSize_xyLayout(parent) {
+	var bounds = new Rectangle(0, 0, 0, 0);
+	var children = getChildren(parent);
+	for (var i=0; i<children.length; i++) {
+		var childBounds = getBounds(children[i]);
+		var prefSize = getPreferredSize(children[i]);
+		childBounds.width = Math.max(childBounds.width, prefSize.width);
+		childBounds.height = Math.max(childBounds.height, prefSize.height);
+		var right = Math.max(bounds.x + bounds.width, childBounds.x + childBounds.width);
+		var bottom = Math.max(bounds.y + bounds.height, childBounds.y + childBounds.height);
+		bounds.x = Math.max(bounds.x, childBounds.x);
+		bounds.y = Math.max(bounds.y, childBounds.y);
+		bounds.width = right - bounds.x;
+		bounds.height = bottom - bounds.y;
+	}
+	return new Dimension(bounds.width, bounds.height);
+}
+
+function stackLayout(parent) {
+	var x = +parent.getAttribute("x");
+	var y = +parent.getAttribute("y");
+	var width = +parent.getAttribute("width");
+	var height = +parent.getAttribute("height");
+	
+	if (parent.tagName == "svg") {
+		x = 0;
+		y = 0;
+	}
+
+	var children = getChildren(parent);
+	var n = children.length;
+	for (var i=0; i<n; i++) {
+		setBounds(children[i], x, y, width, height);
+	}
+}
+
+function getPreferredSize_stackLayout(parent) {
+	var prefSize = new Dimension(0, 0);
+	var children = getChildren(parent);
+	for (var i=0; i<children.length; i++) {
+		var childSize = getPreferredSize(children[i]);
+		prefSize.width = Math.max(prefSize.width, childSize.width);
+		prefSize.height = Math.max(prefSize.height, childSize.height);
+	}
+	return prefSize;
+}
+
+function flowLayout(parent, horizontal, insets) {
+	var x = +parent.getAttribute("x")+insets;
+	var y = +parent.getAttribute("y")+insets;
+	var width = +parent.getAttribute("width")-2*insets;
+	var height = +parent.getAttribute("height")-2*insets;
+
+	if (parent.tagName == "svg") {
+		x = 0;
+		y = 0;
+	}
+
+    var children = getChildren(parent);
+	var n = children.length;
+	for (var i=0; i<n; i++) {
+		var prefSize = getPreferredSize(children[i]);
+		if (horizontal) {
+			var childWidth = prefSize.width;
+			setBounds(children[i], x, y, childWidth, height);
+			x += childWidth;
+		} else {
+			var childHeight = prefSize.height;
+			setBounds(children[i], x, y, width, childHeight);
+			y += childHeight;
+		}
+	}
+}
+
+function getPreferredSize_flowLayout(parent, horizontal) {
+	var prefSize = new Dimension(0, 0);
+	var children = getChildren(parent);
+	for (var i=0; i<children.length; i++) {
+		var childSize = getPreferredSize(children[i]);
+		if (horizontal) {
+			prefSize.width += childSize.width;
+			prefSize.height = Math.max(prefSize.height, childSize.height);
+		} else {
+			prefSize.width = Math.max(prefSize.width, childSize.width);
+			prefSize.height += childSize.height;
+		}
+	}
+	return prefSize;
+}
+
+function Rectangle(x, y, width, height) {
+	this.x = x;
+	this.y = y;
+	this.width = width;
+	this.height = height;
+}
+
+function Point(x, y) {
+	this.x = x;
+	this.y = y;
+}
+
+function Dimension(width, height) {
+	this.width = width;
+	this.height = height;
+}
+
+function getChildren(parent) {
+	var children = [];
+	var elements = parent.childNodes;
+	for (var i=0; i<elements.length; i++) {
+		var element = elements.item(i);
+		if (element.tagName != "script" && element.tagName != "defs" && element.nodeType != 3)
+			children.push(element);
+	}
+	return children;
+}
+
+function validate(parent) {
+	layout(parent);
+	var children = getChildren(parent);
+	for (var i=0; i<children.length; i++)
+		validate(children[i]);
+}
+
+function layout(parent) {
+	var lm = parent.getAttribute("layout");
+	if (lm != null && lm.length>0)
+		eval(lm);
+}
+
+function getPreferredSize(parent) {
+	var lm = parent.getAttribute("layout");
+	if (lm != null && lm.length>0) {
+		var prefSize = eval("getPreferredSize_"+lm);
+		return prefSize;
+	} 
+	var bbox = parent.getBBox();
+	return new Dimension(bbox.width, bbox.height);
+}
+
+function getBounds(element) {
+	var bbox = element.getBBox();
+	return new Rectangle(bbox.x, bbox.y, bbox.width, bbox.height);
+}
+
+function setBounds(element, x, y, width, height) {
+	
+	if (element.tagName == "rect")
+		setRectBounds(element, x, y, width, height);
+	else if (element.tagName == "svg")
+		setSvgBounds(element, x, y, width, height);
+	else if (element.tagName == "g")
+		setGBounds(element, x, y, width, height);
+	else if (element.tagName == "circle")
+		setCircleBounds(element, x, y, width, height);
+	else if (element.tagName == "text")
+		setTextBounds(element, x, y, width, height);
+}
+
+function setSvgBounds(element, x, y, width, height) {
+	element.setAttribute("x", x);
+	element.setAttribute("y", y);
+	element.setAttribute("width", width);
+	element.setAttribute("height", height);
+}
+
+function setGBounds(element, x, y, width, height) {
+	element.setAttribute("x", x);
+	element.setAttribute("y", y);
+	element.setAttribute("width", width);
+	element.setAttribute("height", height);
+}
+
+function setRectBounds(element, x, y, width, height) {
+	element.setAttribute("x", x+1);
+	element.setAttribute("y", y+1);
+	element.setAttribute("width", width-2);
+	element.setAttribute("height", height-2);
+}
+
+function setCircleBounds(element, x, y, width, height) {
+	element.setAttribute("cx", x+width/2);
+	element.setAttribute("cy", y+height/2);
+	if (width <= height)
+		element.setAttribute("r", width/2);
+	else
+		element.setAttribute("r", height/2);
+}
+
+function setTextBounds(element, x, y, width, height) {
+	var anchor = element.getAttribute("text-anchor");
+	if (anchor == "middle")
+		element.setAttribute("x", x+width/2);
+	else if (anchor == "end")
+		element.setAttribute("x", x+width);
+	else
+		element.setAttribute("x", x);
+	var bbox = element.getBBox();
+	element.setAttribute("y", y+bbox.height);
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java
new file mode 100644
index 00000000000..ed4d4c36f3d
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+package org.eclipse.papyrus.umldi2dg;
+
+import java.awt.Color;
+
+import org.eclipse.papyrus.dd.dc.DCFactory;
+import org.eclipse.papyrus.dd.dc.DCPackage;
+
+public class UtilitiesLibrary {
+	
+	public UtilitiesLibrary() {
+		super();
+	}
+
+	public Color createColor(String colorStr) {
+		return (Color)DCFactory.eINSTANCE.createFromString(DCPackage.eINSTANCE.getColor(), colorStr);
+	}
+	
+}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldefinitions.qvto b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldefinitions.qvto
new file mode 100644
index 00000000000..585330867da
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldefinitions.qvto
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+import org.eclipse.papyrus.umldi2dg.UtilitiesLibrary;
+
+modeltype DC uses "http://www.omg.org/spec/DD/20110901/DC";
+modeltype DG uses "http://www.omg.org/spec/DD/20110901/DG";
+modeltype DI uses "http://www.omg.org/spec/DD/20110901/DI";
+modeltype UMLDI uses "http://www.omg.org/spec/UML/20131001/UMLDI";
+modeltype UML uses "http://www.eclipse.org/uml2/4.0.0/UML";
+
+library umldefinitions;
+
+property openArrow : DG::Marker = object DG::Marker {
+	id := "openArrow";
+	size := object DC::Dimension { width := 12; height := 10; };
+	reference := object DC::Point { x := 12; y := 5; };
+	member := object DG::Polyline {
+		point += object DC::Point { x := 0; y := 0; };
+		point += object DC::Point { x := 12; y := 5; };
+		point += object DC::Point { x := 0; y := 10; };
+	}
+};	
+
+property closedArrow : DG::Marker = object DG::Marker {
+	id := "closedArrow";
+	size := object DC::Dimension { width := 12; height := 10; };
+	reference := object DC::Point { x := 12; y := 5; };
+	member := object DG::Polygon {
+		point += object DC::Point { x := 1; y := 1; };
+		point += object DC::Point { x := 11; y := 5; };
+		point += object DC::Point { x := 1; y := 9; };
+		style := object DG::Style { fill := object DG::Paint { color := createColor('#FFFFFF') } };
+	}
+};	
+
+property umlDefinitions : DG::Definitions = object DG::Definitions {
+	styleSheet := object DG::StyleSheet {
+		rule += object DG::StyleRule {
+			selector := object DG::StyleSelector {
+				kind := DG::ElementKind::canvas;
+			};
+			style := object DG::Style {
+				fill := null;
+				stroke := object DG::Paint {
+					color := createColor('#000000');
+				};
+			};
+		};
+		rule += object DG::StyleRule {
+			selector := object DG::StyleSelector {
+				kind := DG::ElementKind::text;
+			};
+			style := object DG::Style {
+				stroke := null;
+				fill := object DG::Paint {
+					color := createColor('#000000');
+				};
+			};
+		};
+	};
+	defnition += openArrow;
+	defnition += closedArrow;
+};
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldi2dg.qvto b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldi2dg.qvto
new file mode 100644
index 00000000000..0b94d69e3c0
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/transforms/umldi2dg.qvto
@@ -0,0 +1,136 @@
+/**
+ * Copyright (c) 2014 CEA LIST.
+ *  
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *  
+ * Contributors:
+ *  CEA LIST - Initial API and implementation
+ */
+import umldefinitions;
+
+modeltype DC uses "http://www.omg.org/spec/DD/20110901/DC";
+modeltype DG uses "http://www.omg.org/spec/DD/20110901/DG";
+modeltype DI uses "http://www.omg.org/spec/DD/20110901/DI";
+modeltype UMLDI uses "http://www.omg.org/spec/UML/20131001/UMLDI";
+modeltype UML uses "http://www.eclipse.org/uml2/4.0.0/UML";
+	
+transformation umldi2dg(in umldi : UMLDI, out DG);
+
+main() {
+	umldi.rootObjects()[UMLDI::UmlDiagram]->map diagram2Canvas();
+}
+
+abstract mapping UMLDI::UmlDiagramElement::diagramElement2GraphicalElement() : DG::GraphicalElement {
+	style := self.localUmlStyle.umlStyle2Style();
+}
+
+mapping UMLDI::UmlDiagram::diagram2Canvas() : DG::RootCanvas 
+	inherits UMLDI::UmlDiagramElement::diagramElement2GraphicalElement
+{
+	definitions := umlDefinitions;
+	
+	script += "platform:/plugin/org.eclipse.papyrus.umldi2dg/scripts/umllayouts.js";
+	
+	layout := "xyLayout(parent)";
+	member += self.ownedDiagramElement[UMLDI::UmlShape]->map allUmlShape2Canvas();
+	member += self.ownedDiagramElement[UMLDI::UmlEdge]->map allUmlEdge2Group();
+}
+
+mapping UMLDI::UmlShape::allUmlShape2Canvas() : DG::Canvas
+	disjuncts UMLDI::UmlShape::classShape2Canvas
+{
+}
+
+mapping UMLDI::UmlEdge::allUmlEdge2Group() : DG::Group
+	disjuncts UMLDI::UmlEdge::generalizationEdge2Group
+{	
+}
+
+abstract mapping UMLDI::UmlShape::umlShape2Canvas() : DG::Canvas 
+	inherits UMLDI::UmlDiagramElement::diagramElement2GraphicalElement
+{
+	bounds := self.bounds.clone().oclAsType(DC::Bounds);
+}
+
+mapping UMLDI::UmlShape::classShape2Canvas() : DG::Canvas
+	inherits UMLDI::UmlShape::umlShape2Canvas
+	when { self.umlModelElement->at(1).oclIsKindOf(UML::Class) }
+{
+	layout := "stackLayout(parent)";	
+	member += object DG::Rectangle {};
+	member += object DG::Group {
+		layout := "flowLayout(parent, false, 0)";
+		member += self.ownedUmlDiagramElement[UMLDI::UmlLabel]->map umlLabel2Text();
+		member += self.ownedUmlDiagramElement[UMLDI::UmlCompartment]->map umlCompartment2Group();
+	}
+}
+
+abstract mapping UMLDI::UmlEdge::umlEdge2Group() : DG::Group 
+	inherits UMLDI::UmlDiagramElement::diagramElement2GraphicalElement
+{
+	member += object DG::Path {
+		command += object DG::MoveTo { point := self.waypoint->first().clone().oclAsType(DC::Point) };
+		self.waypoint->excluding(self.waypoint->first())->forEach(p) {
+			command +=  object DG::LineTo { point := p.clone().oclAsType(DC::Point) };
+		};
+	};
+}
+
+mapping UMLDI::UmlEdge::generalizationEdge2Group() : DG::Group
+	inherits UMLDI::UmlEdge::umlEdge2Group
+	when { self.umlModelElement->at(1).oclIsKindOf(UML::Generalization) }
+{
+	var path : DG::Path = member->any(oclIsKindOf(DG::Path)).oclAsType(DG::Path);
+	path.endMarker := closedArrow;		
+}
+
+mapping UMLDI::UmlLabel::umlLabel2Text() : DG::Text
+	inherits UMLDI::UmlDiagramElement::diagramElement2GraphicalElement
+{
+	init {
+		var umlElement = self.umlModelElement->at(1).oclAsType(UML::Element);
+		result := umlElement.map umlLabel2Text(self);
+	}
+	position := object Point { x := self.bounds.x; y := self.bounds.y; };
+}
+
+mapping UMLDI::UmlCompartment::umlCompartment2Group() : DG::Group
+	inherits UMLDI::UmlDiagramElement::diagramElement2GraphicalElement
+{
+	var umlElement = self.umlModelElement->at(1).oclAsType(UML::Element);
+	layout := "stackLayout(parent)";	
+	member += object DG::Rectangle {};
+	member += umlElement.map umlCompartment2Group(self);
+}
+
+helper UMLDI::UmlStyle::umlStyle2Style() : DG::Style {
+	return object DG::Style {
+		fontName := self.fontName;
+		fontSize := self.fontSize;
+	}
+}
+
+abstract mapping UML::Element::umlLabel2Text(label : UMLDI::UmlLabel) : DG::Text;
+
+mapping UML::NamedElement::umlLabel2Text(label : UMLDI::UmlLabel) : DG::Text 
+	inherits UML::Element::umlLabel2Text
+{
+	if 	(label.kind = UmlLabelKind::name) then {
+		data := self.name;
+		anchor := TextAnchor::middle; 
+	} endif;
+}
+
+abstract mapping UML::Element::umlCompartment2Group(compartment : UMLDI::UmlCompartment) : DG::Group;
+
+mapping UML::StructuredClassifier::umlCompartment2Group(compartment : UMLDI::UmlCompartment) : DG::Group
+	inherits UML::Element::umlCompartment2Group
+{
+	if 	(compartment.kind = UmlCompartmentKind::attributes) then {
+		layout := "flowLayout(parent, false, 0)";
+		member += compartment.ownedUmlDiagramElement[UMLDI::UmlLabel]->map umlLabel2Text(); 
+	} endif;
+}