Merge branch 'master' into bugs/462954-alf

Change-Id: Ic42952adfd3ec4b1b32db5d3f4bf3613e5902296
Signed-off-by: Arnaud Cuccuru <arnaud.cuccuru@cea.fr>

44 files changed, 904 insertions, 1854 deletions

diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java
index c22636d4ff5..6a9763ec500 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Canvas} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class CanvasItemProvider extends GroupItemProvider {
@@ -48,9 +49,8 @@ public class CanvasItemProvider extends GroupItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class CanvasItemProvider extends GroupItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.CANVAS__BOUNDS);
 		}
@@ -73,19 +74,20 @@ public class CanvasItemProvider extends GroupItemProvider {
 
 	/**
 	 * <!-- 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 Canvas.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,14 +99,13 @@ public class CanvasItemProvider extends GroupItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Canvas)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Canvas_type") :
-			getString("_UI_Canvas_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Canvas_type") : getString("_UI_Canvas_type") + " " + label;
 	}
 
 	/**
@@ -112,16 +113,16 @@ public class CanvasItemProvider extends GroupItemProvider {
 	 * 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(Canvas.class)) {
-			case DGPackage.CANVAS__BOUNDS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Canvas.class)) {
+		case DGPackage.CANVAS__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -136,10 +137,6 @@ public class CanvasItemProvider extends GroupItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.CANVAS__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.CANVAS__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java
index 6b7e84984f3..a52a1a896d3 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Circle} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class CircleItemProvider extends GraphicalElementItemProvider {
@@ -50,9 +51,8 @@ public class CircleItemProvider extends GraphicalElementItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addRadiusPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -65,19 +65,7 @@ public class CircleItemProvider extends GraphicalElementItemProvider {
 	 * @generated
 	 */
 	protected void addRadiusPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Circle_radius_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Circle_radius_feature", "_UI_Circle_type"),
-				 DGPackage.Literals.CIRCLE__RADIUS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Circle_radius_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Circle_radius_feature", "_UI_Circle_type"), DGPackage.Literals.CIRCLE__RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -85,11 +73,12 @@ public class CircleItemProvider extends GraphicalElementItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.CIRCLE__CENTER);
 		}
@@ -98,19 +87,20 @@ public class CircleItemProvider extends GraphicalElementItemProvider {
 
 	/**
 	 * <!-- 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 Circle.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -122,14 +112,13 @@ public class CircleItemProvider extends GraphicalElementItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Circle)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Circle_type") :
-			getString("_UI_Circle_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Circle_type") : getString("_UI_Circle_type") + " " + label;
 	}
 
 	/**
@@ -137,19 +126,19 @@ public class CircleItemProvider extends GraphicalElementItemProvider {
 	 * 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(Circle.class)) {
-			case DGPackage.CIRCLE__RADIUS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.CIRCLE__CENTER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Circle.class)) {
+		case DGPackage.CIRCLE__RADIUS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.CIRCLE__CENTER:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -164,10 +153,6 @@ public class CircleItemProvider extends GraphicalElementItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.CIRCLE__CENTER,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.CIRCLE__CENTER, DCFactory.eINSTANCE.createPoint()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java
index bc6f9484d5d..e65f02200c0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java
@@ -22,6 +22,7 @@ import org.eclipse.papyrus.dd.dg.ClipPath;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.ClipPath} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ClipPathItemProvider extends GroupItemProvider {
@@ -44,9 +45,8 @@ public class ClipPathItemProvider extends GroupItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -54,6 +54,7 @@ public class ClipPathItemProvider extends GroupItemProvider {
 	/**
 	 * This returns ClipPath.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -65,14 +66,13 @@ public class ClipPathItemProvider extends GroupItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((ClipPath)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ClipPath_type") :
-			getString("_UI_ClipPath_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_ClipPath_type") : getString("_UI_ClipPath_type") + " " + label;
 	}
 
 	/**
@@ -80,6 +80,7 @@ public class ClipPathItemProvider extends GroupItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java
index b1659e24eaa..54061741505 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java
@@ -22,6 +22,7 @@ import org.eclipse.papyrus.dd.dg.ClosePath;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.ClosePath} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class ClosePathItemProvider extends PathCommandItemProvider {
@@ -44,9 +45,8 @@ public class ClosePathItemProvider extends PathCommandItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -54,6 +54,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider {
 	/**
 	 * This returns ClosePath.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -65,6 +66,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -78,6 +80,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java
index 65c0d3c8b58..d049b6fe794 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.CubicCurveTo} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class CubicCurveToItemProvider extends PathCommandItemProvider {
@@ -48,9 +49,8 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL);
 			childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL);
@@ -75,13 +76,13 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider {
 
 	/**
 	 * <!-- 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);
 	}
 
@@ -100,6 +101,7 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,18 +115,18 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider {
 	 * 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(CubicCurveTo.class)) {
-			case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-			case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-			case DGPackage.CUBIC_CURVE_TO__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(CubicCurveTo.class)) {
+		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
+		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
+		case DGPackage.CUBIC_CURVE_TO__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -139,21 +141,9 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.CUBIC_CURVE_TO__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.CUBIC_CURVE_TO__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
 
 	/**
@@ -166,16 +156,9 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider {
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
-
-		boolean qualify =
-			childFeature == DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL ||
-			childFeature == DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL ||
-			childFeature == DGPackage.Literals.CUBIC_CURVE_TO__POINT;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		boolean qualify = childFeature == DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL || childFeature == DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL || childFeature == DGPackage.Literals.CUBIC_CURVE_TO__POINT;
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java
index 5f909c3b41c..8553f38333d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java
@@ -41,6 +41,7 @@ import org.eclipse.papyrus.dd.dg.util.DGAdapterFactory;
  * Note that most of the adapters are shared among multiple instances.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class DGItemProviderAdapterFactory extends DGAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
@@ -48,6 +49,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
@@ -64,6 +66,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * 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>();
@@ -88,6 +91,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Canvas} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CanvasItemProvider canvasItemProvider;
@@ -95,14 +99,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Canvas}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createCanvasAdapter() {
-		if (canvasItemProvider == null) {
+		if(canvasItemProvider == null) {
 			canvasItemProvider = new CanvasItemProvider(this);
 		}
-
 		return canvasItemProvider;
 	}
 
@@ -110,6 +114,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Group} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GroupItemProvider groupItemProvider;
@@ -117,14 +122,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Group}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createGroupAdapter() {
-		if (groupItemProvider == null) {
+		if(groupItemProvider == null) {
 			groupItemProvider = new GroupItemProvider(this);
 		}
-
 		return groupItemProvider;
 	}
 
@@ -132,6 +137,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.MoveTo} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MoveToItemProvider moveToItemProvider;
@@ -139,14 +145,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.MoveTo}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createMoveToAdapter() {
-		if (moveToItemProvider == null) {
+		if(moveToItemProvider == null) {
 			moveToItemProvider = new MoveToItemProvider(this);
 		}
-
 		return moveToItemProvider;
 	}
 
@@ -154,6 +160,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.ClipPath} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ClipPathItemProvider clipPathItemProvider;
@@ -161,14 +168,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.ClipPath}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createClipPathAdapter() {
-		if (clipPathItemProvider == null) {
+		if(clipPathItemProvider == null) {
 			clipPathItemProvider = new ClipPathItemProvider(this);
 		}
-
 		return clipPathItemProvider;
 	}
 
@@ -176,6 +183,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Style} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StyleItemProvider styleItemProvider;
@@ -183,14 +191,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Style}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createStyleAdapter() {
-		if (styleItemProvider == null) {
+		if(styleItemProvider == null) {
 			styleItemProvider = new StyleItemProvider(this);
 		}
-
 		return styleItemProvider;
 	}
 
@@ -198,6 +206,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Paint} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PaintItemProvider paintItemProvider;
@@ -205,14 +214,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Paint}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPaintAdapter() {
-		if (paintItemProvider == null) {
+		if(paintItemProvider == null) {
 			paintItemProvider = new PaintItemProvider(this);
 		}
-
 		return paintItemProvider;
 	}
 
@@ -220,6 +229,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Circle} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CircleItemProvider circleItemProvider;
@@ -227,14 +237,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Circle}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createCircleAdapter() {
-		if (circleItemProvider == null) {
+		if(circleItemProvider == null) {
 			circleItemProvider = new CircleItemProvider(this);
 		}
-
 		return circleItemProvider;
 	}
 
@@ -249,14 +259,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.ClosePath}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createClosePathAdapter() {
-		if (closePathItemProvider == null) {
+		if(closePathItemProvider == null) {
 			closePathItemProvider = new ClosePathItemProvider(this);
 		}
-
 		return closePathItemProvider;
 	}
 
@@ -272,14 +282,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.CubicCurveTo}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createCubicCurveToAdapter() {
-		if (cubicCurveToItemProvider == null) {
+		if(cubicCurveToItemProvider == null) {
 			cubicCurveToItemProvider = new CubicCurveToItemProvider(this);
 		}
-
 		return cubicCurveToItemProvider;
 	}
 
@@ -295,14 +305,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Definitions}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createDefinitionsAdapter() {
-		if (definitionsItemProvider == null) {
+		if(definitionsItemProvider == null) {
 			definitionsItemProvider = new DefinitionsItemProvider(this);
 		}
-
 		return definitionsItemProvider;
 	}
 
@@ -318,14 +328,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSheet}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createStyleSheetAdapter() {
-		if (styleSheetItemProvider == null) {
+		if(styleSheetItemProvider == null) {
 			styleSheetItemProvider = new StyleSheetItemProvider(this);
 		}
-
 		return styleSheetItemProvider;
 	}
 
@@ -340,14 +350,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleRule}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createStyleRuleAdapter() {
-		if (styleRuleItemProvider == null) {
+		if(styleRuleItemProvider == null) {
 			styleRuleItemProvider = new StyleRuleItemProvider(this);
 		}
-
 		return styleRuleItemProvider;
 	}
 
@@ -363,14 +373,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSelector}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createStyleSelectorAdapter() {
-		if (styleSelectorItemProvider == null) {
+		if(styleSelectorItemProvider == null) {
 			styleSelectorItemProvider = new StyleSelectorItemProvider(this);
 		}
-
 		return styleSelectorItemProvider;
 	}
 
@@ -378,6 +388,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Ellipse} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EllipseItemProvider ellipseItemProvider;
@@ -385,14 +396,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Ellipse}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createEllipseAdapter() {
-		if (ellipseItemProvider == null) {
+		if(ellipseItemProvider == null) {
 			ellipseItemProvider = new EllipseItemProvider(this);
 		}
-
 		return ellipseItemProvider;
 	}
 
@@ -408,14 +419,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo}.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createEllipticalArcToAdapter() {
-		if (ellipticalArcToItemProvider == null) {
+		if(ellipticalArcToItemProvider == null) {
 			ellipticalArcToItemProvider = new EllipticalArcToItemProvider(this);
 		}
-
 		return ellipticalArcToItemProvider;
 	}
 
@@ -431,14 +442,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo}.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createQuadraticCurveToAdapter() {
-		if (quadraticCurveToItemProvider == null) {
+		if(quadraticCurveToItemProvider == null) {
 			quadraticCurveToItemProvider = new QuadraticCurveToItemProvider(this);
 		}
-
 		return quadraticCurveToItemProvider;
 	}
 
@@ -454,14 +465,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.GradientStop}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createGradientStopAdapter() {
-		if (gradientStopItemProvider == null) {
+		if(gradientStopItemProvider == null) {
 			gradientStopItemProvider = new GradientStopItemProvider(this);
 		}
-
 		return gradientStopItemProvider;
 	}
 
@@ -469,6 +480,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Image} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImageItemProvider imageItemProvider;
@@ -476,14 +488,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Image}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createImageAdapter() {
-		if (imageItemProvider == null) {
+		if(imageItemProvider == null) {
 			imageItemProvider = new ImageItemProvider(this);
 		}
-
 		return imageItemProvider;
 	}
 
@@ -491,6 +503,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Line} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LineItemProvider lineItemProvider;
@@ -498,14 +511,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Line}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createLineAdapter() {
-		if (lineItemProvider == null) {
+		if(lineItemProvider == null) {
 			lineItemProvider = new LineItemProvider(this);
 		}
-
 		return lineItemProvider;
 	}
 
@@ -513,6 +526,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Marker} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MarkerItemProvider markerItemProvider;
@@ -520,14 +534,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Marker}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createMarkerAdapter() {
-		if (markerItemProvider == null) {
+		if(markerItemProvider == null) {
 			markerItemProvider = new MarkerItemProvider(this);
 		}
-
 		return markerItemProvider;
 	}
 
@@ -543,14 +557,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.LinearGradient}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createLinearGradientAdapter() {
-		if (linearGradientItemProvider == null) {
+		if(linearGradientItemProvider == null) {
 			linearGradientItemProvider = new LinearGradientItemProvider(this);
 		}
-
 		return linearGradientItemProvider;
 	}
 
@@ -558,6 +572,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.LineTo} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LineToItemProvider lineToItemProvider;
@@ -565,14 +580,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.LineTo}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createLineToAdapter() {
-		if (lineToItemProvider == null) {
+		if(lineToItemProvider == null) {
 			lineToItemProvider = new LineToItemProvider(this);
 		}
-
 		return lineToItemProvider;
 	}
 
@@ -580,6 +595,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Matrix} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MatrixItemProvider matrixItemProvider;
@@ -587,14 +603,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Matrix}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createMatrixAdapter() {
-		if (matrixItemProvider == null) {
+		if(matrixItemProvider == null) {
 			matrixItemProvider = new MatrixItemProvider(this);
 		}
-
 		return matrixItemProvider;
 	}
 
@@ -602,6 +618,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Path} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PathItemProvider pathItemProvider;
@@ -609,14 +626,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Path}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPathAdapter() {
-		if (pathItemProvider == null) {
+		if(pathItemProvider == null) {
 			pathItemProvider = new PathItemProvider(this);
 		}
-
 		return pathItemProvider;
 	}
 
@@ -624,6 +641,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Pattern} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PatternItemProvider patternItemProvider;
@@ -631,14 +649,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Pattern}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPatternAdapter() {
-		if (patternItemProvider == null) {
+		if(patternItemProvider == null) {
 			patternItemProvider = new PatternItemProvider(this);
 		}
-
 		return patternItemProvider;
 	}
 
@@ -646,6 +664,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Polygon} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PolygonItemProvider polygonItemProvider;
@@ -653,14 +672,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Polygon}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPolygonAdapter() {
-		if (polygonItemProvider == null) {
+		if(polygonItemProvider == null) {
 			polygonItemProvider = new PolygonItemProvider(this);
 		}
-
 		return polygonItemProvider;
 	}
 
@@ -668,6 +687,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Polyline} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PolylineItemProvider polylineItemProvider;
@@ -675,14 +695,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Polyline}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPolylineAdapter() {
-		if (polylineItemProvider == null) {
+		if(polylineItemProvider == null) {
 			polylineItemProvider = new PolylineItemProvider(this);
 		}
-
 		return polylineItemProvider;
 	}
 
@@ -698,14 +718,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.RadialGradient}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createRadialGradientAdapter() {
-		if (radialGradientItemProvider == null) {
+		if(radialGradientItemProvider == null) {
 			radialGradientItemProvider = new RadialGradientItemProvider(this);
 		}
-
 		return radialGradientItemProvider;
 	}
 
@@ -720,14 +740,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Rectangle}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createRectangleAdapter() {
-		if (rectangleItemProvider == null) {
+		if(rectangleItemProvider == null) {
 			rectangleItemProvider = new RectangleItemProvider(this);
 		}
-
 		return rectangleItemProvider;
 	}
 
@@ -743,14 +763,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.RootCanvas}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createRootCanvasAdapter() {
-		if (rootCanvasItemProvider == null) {
+		if(rootCanvasItemProvider == null) {
 			rootCanvasItemProvider = new RootCanvasItemProvider(this);
 		}
-
 		return rootCanvasItemProvider;
 	}
 
@@ -758,6 +778,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Rotate} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RotateItemProvider rotateItemProvider;
@@ -765,14 +786,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Rotate}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createRotateAdapter() {
-		if (rotateItemProvider == null) {
+		if(rotateItemProvider == null) {
 			rotateItemProvider = new RotateItemProvider(this);
 		}
-
 		return rotateItemProvider;
 	}
 
@@ -780,6 +801,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Scale} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ScaleItemProvider scaleItemProvider;
@@ -787,14 +809,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Scale}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createScaleAdapter() {
-		if (scaleItemProvider == null) {
+		if(scaleItemProvider == null) {
 			scaleItemProvider = new ScaleItemProvider(this);
 		}
-
 		return scaleItemProvider;
 	}
 
@@ -802,6 +824,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Skew} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SkewItemProvider skewItemProvider;
@@ -809,14 +832,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Skew}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createSkewAdapter() {
-		if (skewItemProvider == null) {
+		if(skewItemProvider == null) {
 			skewItemProvider = new SkewItemProvider(this);
 		}
-
 		return skewItemProvider;
 	}
 
@@ -824,6 +847,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Text} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TextItemProvider textItemProvider;
@@ -831,14 +855,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Text}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createTextAdapter() {
-		if (textItemProvider == null) {
+		if(textItemProvider == null) {
 			textItemProvider = new TextItemProvider(this);
 		}
-
 		return textItemProvider;
 	}
 
@@ -853,14 +877,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Translate}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createTranslateAdapter() {
-		if (translateItemProvider == null) {
+		if(translateItemProvider == null) {
 			translateItemProvider = new TranslateItemProvider(this);
 		}
-
 		return translateItemProvider;
 	}
 
@@ -868,6 +892,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Use} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UseItemProvider useItemProvider;
@@ -880,10 +905,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	@Override
 	public Adapter createUseAdapter() {
-		if (useItemProvider == null) {
+		if(useItemProvider == null) {
 			useItemProvider = new UseItemProvider(this);
 		}
-
 		return useItemProvider;
 	}
 
@@ -909,6 +933,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -919,6 +944,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -928,23 +954,24 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
+		if(isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+			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) {
@@ -954,6 +981,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	/**
 	 * This removes a listener.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -968,8 +996,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 */
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
+		if(parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -981,41 +1008,77 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements Co
 	 * @generated
 	 */
 	public void dispose() {
-		if (canvasItemProvider != null) canvasItemProvider.dispose();
-		if (groupItemProvider != null) groupItemProvider.dispose();
-		if (moveToItemProvider != null) moveToItemProvider.dispose();
-		if (clipPathItemProvider != null) clipPathItemProvider.dispose();
-		if (styleItemProvider != null) styleItemProvider.dispose();
-		if (paintItemProvider != null) paintItemProvider.dispose();
-		if (circleItemProvider != null) circleItemProvider.dispose();
-		if (closePathItemProvider != null) closePathItemProvider.dispose();
-		if (cubicCurveToItemProvider != null) cubicCurveToItemProvider.dispose();
-		if (definitionsItemProvider != null) definitionsItemProvider.dispose();
-		if (styleSheetItemProvider != null) styleSheetItemProvider.dispose();
-		if (styleRuleItemProvider != null) styleRuleItemProvider.dispose();
-		if (styleSelectorItemProvider != null) styleSelectorItemProvider.dispose();
-		if (ellipseItemProvider != null) ellipseItemProvider.dispose();
-		if (ellipticalArcToItemProvider != null) ellipticalArcToItemProvider.dispose();
-		if (quadraticCurveToItemProvider != null) quadraticCurveToItemProvider.dispose();
-		if (gradientStopItemProvider != null) gradientStopItemProvider.dispose();
-		if (imageItemProvider != null) imageItemProvider.dispose();
-		if (lineItemProvider != null) lineItemProvider.dispose();
-		if (markerItemProvider != null) markerItemProvider.dispose();
-		if (linearGradientItemProvider != null) linearGradientItemProvider.dispose();
-		if (lineToItemProvider != null) lineToItemProvider.dispose();
-		if (matrixItemProvider != null) matrixItemProvider.dispose();
-		if (pathItemProvider != null) pathItemProvider.dispose();
-		if (patternItemProvider != null) patternItemProvider.dispose();
-		if (polygonItemProvider != null) polygonItemProvider.dispose();
-		if (polylineItemProvider != null) polylineItemProvider.dispose();
-		if (radialGradientItemProvider != null) radialGradientItemProvider.dispose();
-		if (rectangleItemProvider != null) rectangleItemProvider.dispose();
-		if (rootCanvasItemProvider != null) rootCanvasItemProvider.dispose();
-		if (rotateItemProvider != null) rotateItemProvider.dispose();
-		if (scaleItemProvider != null) scaleItemProvider.dispose();
-		if (skewItemProvider != null) skewItemProvider.dispose();
-		if (textItemProvider != null) textItemProvider.dispose();
-		if (translateItemProvider != null) translateItemProvider.dispose();
-		if (useItemProvider != null) useItemProvider.dispose();
+		if(canvasItemProvider != null)
+			canvasItemProvider.dispose();
+		if(groupItemProvider != null)
+			groupItemProvider.dispose();
+		if(moveToItemProvider != null)
+			moveToItemProvider.dispose();
+		if(clipPathItemProvider != null)
+			clipPathItemProvider.dispose();
+		if(styleItemProvider != null)
+			styleItemProvider.dispose();
+		if(paintItemProvider != null)
+			paintItemProvider.dispose();
+		if(circleItemProvider != null)
+			circleItemProvider.dispose();
+		if(closePathItemProvider != null)
+			closePathItemProvider.dispose();
+		if(cubicCurveToItemProvider != null)
+			cubicCurveToItemProvider.dispose();
+		if(definitionsItemProvider != null)
+			definitionsItemProvider.dispose();
+		if(styleSheetItemProvider != null)
+			styleSheetItemProvider.dispose();
+		if(styleRuleItemProvider != null)
+			styleRuleItemProvider.dispose();
+		if(styleSelectorItemProvider != null)
+			styleSelectorItemProvider.dispose();
+		if(ellipseItemProvider != null)
+			ellipseItemProvider.dispose();
+		if(ellipticalArcToItemProvider != null)
+			ellipticalArcToItemProvider.dispose();
+		if(quadraticCurveToItemProvider != null)
+			quadraticCurveToItemProvider.dispose();
+		if(gradientStopItemProvider != null)
+			gradientStopItemProvider.dispose();
+		if(imageItemProvider != null)
+			imageItemProvider.dispose();
+		if(lineItemProvider != null)
+			lineItemProvider.dispose();
+		if(markerItemProvider != null)
+			markerItemProvider.dispose();
+		if(linearGradientItemProvider != null)
+			linearGradientItemProvider.dispose();
+		if(lineToItemProvider != null)
+			lineToItemProvider.dispose();
+		if(matrixItemProvider != null)
+			matrixItemProvider.dispose();
+		if(pathItemProvider != null)
+			pathItemProvider.dispose();
+		if(patternItemProvider != null)
+			patternItemProvider.dispose();
+		if(polygonItemProvider != null)
+			polygonItemProvider.dispose();
+		if(polylineItemProvider != null)
+			polylineItemProvider.dispose();
+		if(radialGradientItemProvider != null)
+			radialGradientItemProvider.dispose();
+		if(rectangleItemProvider != null)
+			rectangleItemProvider.dispose();
+		if(rootCanvasItemProvider != null)
+			rootCanvasItemProvider.dispose();
+		if(rotateItemProvider != null)
+			rotateItemProvider.dispose();
+		if(scaleItemProvider != null)
+			scaleItemProvider.dispose();
+		if(skewItemProvider != null)
+			skewItemProvider.dispose();
+		if(textItemProvider != null)
+			textItemProvider.dispose();
+		if(translateItemProvider != null)
+			translateItemProvider.dispose();
+		if(useItemProvider != null)
+			useItemProvider.dispose();
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java
index f038a432443..4a07b11ffec 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java
@@ -36,6 +36,7 @@ import org.eclipse.papyrus.dd.provider.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Definition} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class DefinitionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
@@ -58,9 +59,8 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements IEdit
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addIdPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -70,36 +70,24 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements IEdit
 	 * This adds a property descriptor for the Id feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Definition_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Definition_id_feature", "_UI_Definition_type"),
-				 DGPackage.Literals.DEFINITION__ID,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Definition_id_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Definition_id_feature", "_UI_Definition_type"), DGPackage.Literals.DEFINITION__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Definition)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Definition_type") :
-			getString("_UI_Definition_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Definition_type") : getString("_UI_Definition_type") + " " + label;
 	}
 
 	/**
@@ -107,16 +95,16 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements IEdit
 	 * 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(Definition.class)) {
-			case DGPackage.DEFINITION__ID:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Definition.class)) {
+		case DGPackage.DEFINITION__ID:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java
index 111ea062d41..47e78a99348 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java
@@ -36,6 +36,7 @@ import org.eclipse.papyrus.dd.provider.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Definitions} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class DefinitionsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
@@ -58,9 +59,8 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -70,11 +70,12 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.DEFINITIONS__DEFINITION);
 			childrenFeatures.add(DGPackage.Literals.DEFINITIONS__STYLE_SHEET);
@@ -84,13 +85,13 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
 
 	/**
 	 * <!-- 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);
 	}
 
@@ -109,6 +110,7 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -121,17 +123,17 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
 	 * 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(Definitions.class)) {
-			case DGPackage.DEFINITIONS__DEFINITION:
-			case DGPackage.DEFINITIONS__STYLE_SHEET:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Definitions.class)) {
+		case DGPackage.DEFINITIONS__DEFINITION:
+		case DGPackage.DEFINITIONS__STYLE_SHEET:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -146,101 +148,25 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements IEdi
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createGroup()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createCanvas()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createClipPath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createCircle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createEllipse()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createImage()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createLine()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createMarker()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createLinearGradient()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createPath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createPattern()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createPolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createPolyline()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createRadialGradient()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createRootCanvas()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createText()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFINITION,
-				 DGFactory.eINSTANCE.createUse()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__STYLE_SHEET,
-				 DGFactory.eINSTANCE.createStyleSheet()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createGroup()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createClipPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createCircle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createEllipse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createImage()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createLine()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createMarker()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createLinearGradient()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createPattern()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createPolygon()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createPolyline()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createRadialGradient()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createRectangle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createRootCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createText()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFINITION, DGFactory.eINSTANCE.createUse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__STYLE_SHEET, DGFactory.eINSTANCE.createStyleSheet()));
 	}
 
 	/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java
index 85121145812..60cfd717014 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.Ellipse;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Ellipse} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class EllipseItemProvider extends GraphicalElementItemProvider {
@@ -48,9 +49,8 @@ public class EllipseItemProvider extends GraphicalElementItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class EllipseItemProvider extends GraphicalElementItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.ELLIPSE__CENTER);
 			childrenFeatures.add(DGPackage.Literals.ELLIPSE__RADII);
@@ -74,19 +75,20 @@ public class EllipseItemProvider extends GraphicalElementItemProvider {
 
 	/**
 	 * <!-- 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 Ellipse.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -98,14 +100,13 @@ public class EllipseItemProvider extends GraphicalElementItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Ellipse)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Ellipse_type") :
-			getString("_UI_Ellipse_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Ellipse_type") : getString("_UI_Ellipse_type") + " " + label;
 	}
 
 	/**
@@ -113,17 +114,17 @@ public class EllipseItemProvider extends GraphicalElementItemProvider {
 	 * 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(Ellipse.class)) {
-			case DGPackage.ELLIPSE__CENTER:
-			case DGPackage.ELLIPSE__RADII:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Ellipse.class)) {
+		case DGPackage.ELLIPSE__CENTER:
+		case DGPackage.ELLIPSE__RADII:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -138,15 +139,7 @@ public class EllipseItemProvider extends GraphicalElementItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.ELLIPSE__CENTER,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.ELLIPSE__RADII,
-				 DCFactory.eINSTANCE.createDimension()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.ELLIPSE__CENTER, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.ELLIPSE__RADII, DCFactory.eINSTANCE.createDimension()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
index 14dcd1566e1..441c8129d12 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.dd.dg.EllipticalArcTo;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class EllipticalArcToItemProvider extends PathCommandItemProvider {
@@ -50,9 +51,8 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addRotationPropertyDescriptor(object);
 			addIsLargeArcPropertyDescriptor(object);
 			addIsSweepPropertyDescriptor(object);
@@ -67,19 +67,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider {
 	 * @generated
 	 */
 	protected void addRotationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_EllipticalArcTo_rotation_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_rotation_feature", "_UI_EllipticalArcTo_type"),
-				 DGPackage.Literals.ELLIPTICAL_ARC_TO__ROTATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EllipticalArcTo_rotation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_rotation_feature", "_UI_EllipticalArcTo_type"), DGPackage.Literals.ELLIPTICAL_ARC_TO__ROTATION, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -89,19 +77,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider {
 	 * @generated
 	 */
 	protected void addIsLargeArcPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_EllipticalArcTo_isLargeArc_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isLargeArc_feature", "_UI_EllipticalArcTo_type"),
-				 DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_LARGE_ARC,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EllipticalArcTo_isLargeArc_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isLargeArc_feature", "_UI_EllipticalArcTo_type"), DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_LARGE_ARC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -111,19 +87,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider {
 	 * @generated
 	 */
 	protected void addIsSweepPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_EllipticalArcTo_isSweep_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isSweep_feature", "_UI_EllipticalArcTo_type"),
-				 DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_SWEEP,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EllipticalArcTo_isSweep_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isSweep_feature", "_UI_EllipticalArcTo_type"), DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_SWEEP, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -131,11 +95,12 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII);
 			childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT);
@@ -145,13 +110,13 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider {
 
 	/**
 	 * <!-- 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);
 	}
 
@@ -159,6 +124,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider {
 	 * This returns EllipticalArcTo.gif.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -170,6 +136,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -183,22 +150,22 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider {
 	 * 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(EllipticalArcTo.class)) {
-			case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
-			case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
-			case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-			case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(EllipticalArcTo.class)) {
+		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
+		case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
+		case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -213,15 +180,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII,
-				 DCFactory.eINSTANCE.createDimension()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII, DCFactory.eINSTANCE.createDimension()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java
index c5abe95b8f4..e5aae1fa792 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.Gradient;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Gradient} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class GradientItemProvider extends PaintServerItemProvider {
@@ -48,9 +49,8 @@ public class GradientItemProvider extends PaintServerItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class GradientItemProvider extends PaintServerItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.GRADIENT__STOP);
 		}
@@ -73,13 +74,13 @@ public class GradientItemProvider extends PaintServerItemProvider {
 
 	/**
 	 * <!-- 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);
 	}
 
@@ -87,14 +88,13 @@ public class GradientItemProvider extends PaintServerItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Gradient)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Gradient_type") :
-			getString("_UI_Gradient_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Gradient_type") : getString("_UI_Gradient_type") + " " + label;
 	}
 
 	/**
@@ -102,16 +102,16 @@ public class GradientItemProvider extends PaintServerItemProvider {
 	 * 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(Gradient.class)) {
-			case DGPackage.GRADIENT__STOP:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Gradient.class)) {
+		case DGPackage.GRADIENT__STOP:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -126,10 +126,6 @@ public class GradientItemProvider extends PaintServerItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRADIENT__STOP,
-				 DGFactory.eINSTANCE.createGradientStop()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRADIENT__STOP, DGFactory.eINSTANCE.createGradientStop()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java
index 83bdeefd1cf..168f3e925c3 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.dd.provider.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.GradientStop} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class GradientStopItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
@@ -59,9 +60,8 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addColorPropertyDescriptor(object);
 			addOffsetPropertyDescriptor(object);
 			addOpacityPropertyDescriptor(object);
@@ -76,19 +76,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
 	 * @generated
 	 */
 	protected void addColorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GradientStop_color_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_color_feature", "_UI_GradientStop_type"),
-				 DGPackage.Literals.GRADIENT_STOP__COLOR,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_color_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -98,19 +86,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
 	 * @generated
 	 */
 	protected void addOffsetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GradientStop_offset_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_offset_feature", "_UI_GradientStop_type"),
-				 DGPackage.Literals.GRADIENT_STOP__OFFSET,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_offset_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_offset_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__OFFSET, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -120,19 +96,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
 	 * @generated
 	 */
 	protected void addOpacityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GradientStop_opacity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_opacity_feature", "_UI_GradientStop_type"),
-				 DGPackage.Literals.GRADIENT_STOP__OPACITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_opacity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_opacity_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -150,15 +114,14 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		Color labelValue = ((GradientStop)object).getColor();
 		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_GradientStop_type") :
-			getString("_UI_GradientStop_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_GradientStop_type") : getString("_UI_GradientStop_type") + " " + label;
 	}
 
 	/**
@@ -166,18 +129,18 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements IEd
 	 * 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(GradientStop.class)) {
-			case DGPackage.GRADIENT_STOP__COLOR:
-			case DGPackage.GRADIENT_STOP__OFFSET:
-			case DGPackage.GRADIENT_STOP__OPACITY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(GradientStop.class)) {
+		case DGPackage.GRADIENT_STOP__COLOR:
+		case DGPackage.GRADIENT_STOP__OFFSET:
+		case DGPackage.GRADIENT_STOP__OPACITY:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java
index 5a7607e1659..cbb93e9503b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java
@@ -50,9 +50,8 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addClipPathPropertyDescriptor(object);
 			addClassPropertyDescriptor(object);
 			addLayoutDataPropertyDescriptor(object);
@@ -67,19 +66,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider {
 	 * @generated
 	 */
 	protected void addClipPathPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GraphicalElement_clipPath_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_clipPath_feature", "_UI_GraphicalElement_type"),
-				 DGPackage.Literals.GRAPHICAL_ELEMENT__CLIP_PATH,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_clipPath_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_clipPath_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__CLIP_PATH, true, false, true, null, null, null));
 	}
 
 	/**
@@ -89,41 +76,18 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider {
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GraphicalElement_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_class_feature", "_UI_GraphicalElement_type"),
-				 DGPackage.Literals.GRAPHICAL_ELEMENT__CLASS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_class_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_class_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * 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));
+		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));
 	}
 
 	/**
@@ -131,11 +95,12 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE);
 			childrenFeatures.add(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM);
@@ -145,13 +110,13 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider {
 
 	/**
 	 * <!-- 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);
 	}
 
@@ -199,21 +164,21 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider {
 	 * 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(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:
-			case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		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:
+		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -228,35 +193,11 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE,
-				 DGFactory.eINSTANCE.createStyle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
-				 DGFactory.eINSTANCE.createMatrix()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
-				 DGFactory.eINSTANCE.createRotate()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
-				 DGFactory.eINSTANCE.createScale()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
-				 DGFactory.eINSTANCE.createSkew()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
-				 DGFactory.eINSTANCE.createTranslate()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE, DGFactory.eINSTANCE.createStyle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createMatrix()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createRotate()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createScale()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createSkew()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createTranslate()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
index b64346479f8..7e8a5a00c6a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.dd.dg.Group;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Group} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class GroupItemProvider extends GraphicalElementItemProvider {
@@ -50,9 +51,8 @@ public class GroupItemProvider extends GraphicalElementItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addLayoutPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -62,22 +62,11 @@ public class GroupItemProvider extends GraphicalElementItemProvider {
 	 * 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));
+		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));
 	}
 
 	/**
@@ -85,11 +74,12 @@ public class GroupItemProvider extends GraphicalElementItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.GROUP__MEMBER);
 		}
@@ -98,19 +88,20 @@ public class GroupItemProvider extends GraphicalElementItemProvider {
 
 	/**
 	 * <!-- 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 Group.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -136,19 +127,19 @@ public class GroupItemProvider extends GraphicalElementItemProvider {
 	 * 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(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;
+		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;
 		}
 		super.notifyChanged(notification);
 	}
@@ -163,80 +154,20 @@ public class GroupItemProvider extends GraphicalElementItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createGroup()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createCanvas()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createClipPath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createCircle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createEllipse()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createImage()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createLine()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createMarker()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createPath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createPolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createPolyline()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createRootCanvas()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createText()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createUse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createGroup()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createClipPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createCircle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createEllipse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createImage()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createLine()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createMarker()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createPolygon()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createPolyline()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createRectangle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createRootCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createText()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createUse()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java
index faf382a6e3f..e96e5ded4c6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.dd.dg.Image;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Image} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class ImageItemProvider extends GraphicalElementItemProvider {
@@ -50,9 +51,8 @@ public class ImageItemProvider extends GraphicalElementItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addSourcePropertyDescriptor(object);
 			addIsAspectRatioPreservedPropertyDescriptor(object);
 		}
@@ -66,40 +66,17 @@ public class ImageItemProvider extends GraphicalElementItemProvider {
 	 * @generated
 	 */
 	protected void addSourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Image_source_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Image_source_feature", "_UI_Image_type"),
-				 DGPackage.Literals.IMAGE__SOURCE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Image_source_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Image_source_feature", "_UI_Image_type"), DGPackage.Literals.IMAGE__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Is Aspect Ratio Preserved feature.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIsAspectRatioPreservedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Image_isAspectRatioPreserved_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Image_isAspectRatioPreserved_feature", "_UI_Image_type"),
-				 DGPackage.Literals.IMAGE__IS_ASPECT_RATIO_PRESERVED,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Image_isAspectRatioPreserved_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Image_isAspectRatioPreserved_feature", "_UI_Image_type"), DGPackage.Literals.IMAGE__IS_ASPECT_RATIO_PRESERVED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -107,11 +84,12 @@ public class ImageItemProvider extends GraphicalElementItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.IMAGE__BOUNDS);
 		}
@@ -120,19 +98,20 @@ public class ImageItemProvider extends GraphicalElementItemProvider {
 
 	/**
 	 * <!-- 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 Image.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -144,14 +123,13 @@ public class ImageItemProvider extends GraphicalElementItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Image)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Image_type") :
-			getString("_UI_Image_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Image_type") : getString("_UI_Image_type") + " " + label;
 	}
 
 	/**
@@ -159,20 +137,20 @@ public class ImageItemProvider extends GraphicalElementItemProvider {
 	 * 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(Image.class)) {
-			case DGPackage.IMAGE__SOURCE:
-			case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.IMAGE__BOUNDS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Image.class)) {
+		case DGPackage.IMAGE__SOURCE:
+		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.IMAGE__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -187,10 +165,6 @@ public class ImageItemProvider extends GraphicalElementItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.IMAGE__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.IMAGE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java
index ce9b304977c..4fd819ece3b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.Line;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Line} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class LineItemProvider extends MarkedElementItemProvider {
@@ -48,9 +49,8 @@ public class LineItemProvider extends MarkedElementItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class LineItemProvider extends MarkedElementItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.LINE__START);
 			childrenFeatures.add(DGPackage.Literals.LINE__END);
@@ -74,19 +75,20 @@ public class LineItemProvider extends MarkedElementItemProvider {
 
 	/**
 	 * <!-- 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 Line.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -98,14 +100,13 @@ public class LineItemProvider extends MarkedElementItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Line)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Line_type") :
-			getString("_UI_Line_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Line_type") : getString("_UI_Line_type") + " " + label;
 	}
 
 	/**
@@ -113,17 +114,17 @@ public class LineItemProvider extends MarkedElementItemProvider {
 	 * 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(Line.class)) {
-			case DGPackage.LINE__START:
-			case DGPackage.LINE__END:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Line.class)) {
+		case DGPackage.LINE__START:
+		case DGPackage.LINE__END:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -138,16 +139,8 @@ public class LineItemProvider extends MarkedElementItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.LINE__START,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.LINE__END,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINE__START, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINE__END, DCFactory.eINSTANCE.createPoint()));
 	}
 
 	/**
@@ -160,15 +153,9 @@ public class LineItemProvider extends MarkedElementItemProvider {
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
-
-		boolean qualify =
-			childFeature == DGPackage.Literals.LINE__START ||
-			childFeature == DGPackage.Literals.LINE__END;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		boolean qualify = childFeature == DGPackage.Literals.LINE__START || childFeature == DGPackage.Literals.LINE__END;
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java
index b387eba5861..5e636bc110a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.LineTo;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.LineTo} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class LineToItemProvider extends PathCommandItemProvider {
@@ -48,9 +49,8 @@ public class LineToItemProvider extends PathCommandItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class LineToItemProvider extends PathCommandItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.LINE_TO__POINT);
 		}
@@ -73,19 +74,20 @@ public class LineToItemProvider extends PathCommandItemProvider {
 
 	/**
 	 * <!-- 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 LineTo.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,6 +99,7 @@ public class LineToItemProvider extends PathCommandItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -110,16 +113,16 @@ public class LineToItemProvider extends PathCommandItemProvider {
 	 * 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(LineTo.class)) {
-			case DGPackage.LINE_TO__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(LineTo.class)) {
+		case DGPackage.LINE_TO__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -134,10 +137,6 @@ public class LineToItemProvider extends PathCommandItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.LINE_TO__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINE_TO__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java
index 72b1408d1f6..fa06dde62fd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.LinearGradient;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.LinearGradient} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class LinearGradientItemProvider extends GradientItemProvider {
@@ -48,9 +49,8 @@ public class LinearGradientItemProvider extends GradientItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class LinearGradientItemProvider extends GradientItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.LINEAR_GRADIENT__START);
 			childrenFeatures.add(DGPackage.Literals.LINEAR_GRADIENT__END);
@@ -74,13 +75,13 @@ public class LinearGradientItemProvider extends GradientItemProvider {
 
 	/**
 	 * <!-- 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);
 	}
 
@@ -88,6 +89,7 @@ public class LinearGradientItemProvider extends GradientItemProvider {
 	 * This returns LinearGradient.gif.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,14 +101,13 @@ public class LinearGradientItemProvider extends GradientItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((LinearGradient)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_LinearGradient_type") :
-			getString("_UI_LinearGradient_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_LinearGradient_type") : getString("_UI_LinearGradient_type") + " " + label;
 	}
 
 	/**
@@ -114,17 +115,17 @@ public class LinearGradientItemProvider extends GradientItemProvider {
 	 * 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(LinearGradient.class)) {
-			case DGPackage.LINEAR_GRADIENT__START:
-			case DGPackage.LINEAR_GRADIENT__END:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(LinearGradient.class)) {
+		case DGPackage.LINEAR_GRADIENT__START:
+		case DGPackage.LINEAR_GRADIENT__END:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -139,16 +140,8 @@ public class LinearGradientItemProvider extends GradientItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.LINEAR_GRADIENT__START,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.LINEAR_GRADIENT__END,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINEAR_GRADIENT__START, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINEAR_GRADIENT__END, DCFactory.eINSTANCE.createPoint()));
 	}
 
 	/**
@@ -161,15 +154,9 @@ public class LinearGradientItemProvider extends GradientItemProvider {
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
-
-		boolean qualify =
-			childFeature == DGPackage.Literals.LINEAR_GRADIENT__START ||
-			childFeature == DGPackage.Literals.LINEAR_GRADIENT__END;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		boolean qualify = childFeature == DGPackage.Literals.LINEAR_GRADIENT__START || childFeature == DGPackage.Literals.LINEAR_GRADIENT__END;
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java
index ca3fb06e88d..514c8856090 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java
@@ -24,6 +24,7 @@ import org.eclipse.papyrus.dd.dg.MarkedElement;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.MarkedElement} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class MarkedElementItemProvider extends GraphicalElementItemProvider {
@@ -46,9 +47,8 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addEndMarkerPropertyDescriptor(object);
 			addMidMarkerPropertyDescriptor(object);
 			addStartMarkerPropertyDescriptor(object);
@@ -63,19 +63,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider {
 	 * @generated
 	 */
 	protected void addEndMarkerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_MarkedElement_endMarker_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_endMarker_feature", "_UI_MarkedElement_type"),
-				 DGPackage.Literals.MARKED_ELEMENT__END_MARKER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_endMarker_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_endMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__END_MARKER, true, false, true, null, null, null));
 	}
 
 	/**
@@ -85,19 +73,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider {
 	 * @generated
 	 */
 	protected void addMidMarkerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_MarkedElement_midMarker_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_midMarker_feature", "_UI_MarkedElement_type"),
-				 DGPackage.Literals.MARKED_ELEMENT__MID_MARKER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_midMarker_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_midMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__MID_MARKER, true, false, true, null, null, null));
 	}
 
 	/**
@@ -107,33 +83,20 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider {
 	 * @generated
 	 */
 	protected void addStartMarkerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_MarkedElement_startMarker_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_startMarker_feature", "_UI_MarkedElement_type"),
-				 DGPackage.Literals.MARKED_ELEMENT__START_MARKER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_startMarker_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_startMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__START_MARKER, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((MarkedElement)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_MarkedElement_type") :
-			getString("_UI_MarkedElement_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_MarkedElement_type") : getString("_UI_MarkedElement_type") + " " + label;
 	}
 
 	/**
@@ -141,6 +104,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider {
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java
index ece78ea576c..308a50c169d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.Marker;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Marker} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class MarkerItemProvider extends GroupItemProvider {
@@ -48,9 +49,8 @@ public class MarkerItemProvider extends GroupItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class MarkerItemProvider extends GroupItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.MARKER__SIZE);
 			childrenFeatures.add(DGPackage.Literals.MARKER__REFERENCE);
@@ -74,19 +75,20 @@ public class MarkerItemProvider extends GroupItemProvider {
 
 	/**
 	 * <!-- 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 Marker.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -98,14 +100,13 @@ public class MarkerItemProvider extends GroupItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Marker)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Marker_type") :
-			getString("_UI_Marker_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Marker_type") : getString("_UI_Marker_type") + " " + label;
 	}
 
 	/**
@@ -113,17 +114,17 @@ public class MarkerItemProvider extends GroupItemProvider {
 	 * 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(Marker.class)) {
-			case DGPackage.MARKER__SIZE:
-			case DGPackage.MARKER__REFERENCE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Marker.class)) {
+		case DGPackage.MARKER__SIZE:
+		case DGPackage.MARKER__REFERENCE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -138,15 +139,7 @@ public class MarkerItemProvider extends GroupItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.MARKER__SIZE,
-				 DCFactory.eINSTANCE.createDimension()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.MARKER__REFERENCE,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.MARKER__SIZE, DCFactory.eINSTANCE.createDimension()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.MARKER__REFERENCE, DCFactory.eINSTANCE.createPoint()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java
index 5b59025fdd7..a600f5cc5a5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.Matrix;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Matrix} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class MatrixItemProvider extends TransformItemProvider {
@@ -48,9 +49,8 @@ public class MatrixItemProvider extends TransformItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addAPropertyDescriptor(object);
 			addBPropertyDescriptor(object);
 			addCPropertyDescriptor(object);
@@ -65,137 +65,72 @@ public class MatrixItemProvider extends TransformItemProvider {
 	 * This adds a property descriptor for the A feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Matrix_a_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Matrix_a_feature", "_UI_Matrix_type"),
-				 DGPackage.Literals.MATRIX__A,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_a_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_a_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__A, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the B feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addBPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Matrix_b_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Matrix_b_feature", "_UI_Matrix_type"),
-				 DGPackage.Literals.MATRIX__B,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_b_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_b_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__B, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the C feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Matrix_c_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Matrix_c_feature", "_UI_Matrix_type"),
-				 DGPackage.Literals.MATRIX__C,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_c_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_c_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__C, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the D feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Matrix_d_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Matrix_d_feature", "_UI_Matrix_type"),
-				 DGPackage.Literals.MATRIX__D,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_d_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_d_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__D, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the E feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addEPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Matrix_e_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Matrix_e_feature", "_UI_Matrix_type"),
-				 DGPackage.Literals.MATRIX__E,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_e_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_e_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__E, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the F feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addFPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Matrix_f_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Matrix_f_feature", "_UI_Matrix_type"),
-				 DGPackage.Literals.MATRIX__F,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_f_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_f_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__F, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns Matrix.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -207,6 +142,7 @@ public class MatrixItemProvider extends TransformItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -220,21 +156,21 @@ public class MatrixItemProvider extends TransformItemProvider {
 	 * 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(Matrix.class)) {
-			case DGPackage.MATRIX__A:
-			case DGPackage.MATRIX__B:
-			case DGPackage.MATRIX__C:
-			case DGPackage.MATRIX__D:
-			case DGPackage.MATRIX__E:
-			case DGPackage.MATRIX__F:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Matrix.class)) {
+		case DGPackage.MATRIX__A:
+		case DGPackage.MATRIX__B:
+		case DGPackage.MATRIX__C:
+		case DGPackage.MATRIX__D:
+		case DGPackage.MATRIX__E:
+		case DGPackage.MATRIX__F:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java
index eba289370aa..7b4176bc814 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.MoveTo;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.MoveTo} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class MoveToItemProvider extends PathCommandItemProvider {
@@ -48,9 +49,8 @@ public class MoveToItemProvider extends PathCommandItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class MoveToItemProvider extends PathCommandItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.MOVE_TO__POINT);
 		}
@@ -73,19 +74,20 @@ public class MoveToItemProvider extends PathCommandItemProvider {
 
 	/**
 	 * <!-- 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 MoveTo.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,6 +99,7 @@ public class MoveToItemProvider extends PathCommandItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -110,16 +113,16 @@ public class MoveToItemProvider extends PathCommandItemProvider {
 	 * 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(MoveTo.class)) {
-			case DGPackage.MOVE_TO__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(MoveTo.class)) {
+		case DGPackage.MOVE_TO__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -134,10 +137,6 @@ public class MoveToItemProvider extends PathCommandItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.MOVE_TO__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.MOVE_TO__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java
index 70730e2d6a0..7a6918aacad 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.dd.provider.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Paint} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class PaintItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
@@ -59,9 +60,8 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addColorPropertyDescriptor(object);
 			addPaintServerPropertyDescriptor(object);
 		}
@@ -75,19 +75,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addColorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Paint_color_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Paint_color_feature", "_UI_Paint_type"),
-				 DGPackage.Literals.PAINT__COLOR,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Paint_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Paint_color_feature", "_UI_Paint_type"), DGPackage.Literals.PAINT__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -97,24 +85,13 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addPaintServerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Paint_paintServer_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Paint_paintServer_feature", "_UI_Paint_type"),
-				 DGPackage.Literals.PAINT__PAINT_SERVER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Paint_paintServer_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Paint_paintServer_feature", "_UI_Paint_type"), DGPackage.Literals.PAINT__PAINT_SERVER, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This returns Paint.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -126,15 +103,14 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		Color labelValue = ((Paint)object).getColor();
 		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Paint_type") :
-			getString("_UI_Paint_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Paint_type") : getString("_UI_Paint_type") + " " + label;
 	}
 
 	/**
@@ -142,16 +118,16 @@ public class PaintItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * 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(Paint.class)) {
-			case DGPackage.PAINT__COLOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Paint.class)) {
+		case DGPackage.PAINT__COLOR:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java
index 07aaa994af0..8b460941d81 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.PaintServer;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.PaintServer} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class PaintServerItemProvider extends DefinitionItemProvider {
@@ -48,9 +49,8 @@ public class PaintServerItemProvider extends DefinitionItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class PaintServerItemProvider extends DefinitionItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.PAINT_SERVER__TRANSFORM);
 		}
@@ -73,13 +74,13 @@ public class PaintServerItemProvider extends DefinitionItemProvider {
 
 	/**
 	 * <!-- 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);
 	}
 
@@ -87,14 +88,13 @@ public class PaintServerItemProvider extends DefinitionItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((PaintServer)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_PaintServer_type") :
-			getString("_UI_PaintServer_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_PaintServer_type") : getString("_UI_PaintServer_type") + " " + label;
 	}
 
 	/**
@@ -102,16 +102,16 @@ public class PaintServerItemProvider extends DefinitionItemProvider {
 	 * 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(PaintServer.class)) {
-			case DGPackage.PAINT_SERVER__TRANSFORM:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(PaintServer.class)) {
+		case DGPackage.PAINT_SERVER__TRANSFORM:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -126,30 +126,10 @@ public class PaintServerItemProvider extends DefinitionItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PAINT_SERVER__TRANSFORM,
-				 DGFactory.eINSTANCE.createMatrix()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PAINT_SERVER__TRANSFORM,
-				 DGFactory.eINSTANCE.createRotate()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PAINT_SERVER__TRANSFORM,
-				 DGFactory.eINSTANCE.createScale()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PAINT_SERVER__TRANSFORM,
-				 DGFactory.eINSTANCE.createSkew()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PAINT_SERVER__TRANSFORM,
-				 DGFactory.eINSTANCE.createTranslate()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createMatrix()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createRotate()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createScale()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createSkew()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createTranslate()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java
index cf3d1bfda0e..76f1438aee3 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java
@@ -36,6 +36,7 @@ import org.eclipse.papyrus.dd.provider.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.PathCommand} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class PathCommandItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
@@ -58,9 +59,8 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements IEdi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addIsRelativePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -73,25 +73,14 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements IEdi
 	 * @generated
 	 */
 	protected void addIsRelativePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_PathCommand_isRelative_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PathCommand_isRelative_feature", "_UI_PathCommand_type"),
-				 DGPackage.Literals.PATH_COMMAND__IS_RELATIVE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PathCommand_isRelative_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PathCommand_isRelative_feature", "_UI_PathCommand_type"), DGPackage.Literals.PATH_COMMAND__IS_RELATIVE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -105,16 +94,16 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements IEdi
 	 * 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(PathCommand.class)) {
-			case DGPackage.PATH_COMMAND__IS_RELATIVE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(PathCommand.class)) {
+		case DGPackage.PATH_COMMAND__IS_RELATIVE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java
index febabc84edc..73ddf1c1bbd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.Path;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Path} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class PathItemProvider extends MarkedElementItemProvider {
@@ -48,9 +49,8 @@ public class PathItemProvider extends MarkedElementItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class PathItemProvider extends MarkedElementItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.PATH__COMMAND);
 		}
@@ -73,19 +74,20 @@ public class PathItemProvider extends MarkedElementItemProvider {
 
 	/**
 	 * <!-- 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 Path.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,14 +99,13 @@ public class PathItemProvider extends MarkedElementItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Path)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Path_type") :
-			getString("_UI_Path_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Path_type") : getString("_UI_Path_type") + " " + label;
 	}
 
 	/**
@@ -112,16 +113,16 @@ public class PathItemProvider extends MarkedElementItemProvider {
 	 * 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(Path.class)) {
-			case DGPackage.PATH__COMMAND:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Path.class)) {
+		case DGPackage.PATH__COMMAND:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -136,35 +137,11 @@ public class PathItemProvider extends MarkedElementItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATH__COMMAND,
-				 DGFactory.eINSTANCE.createMoveTo()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATH__COMMAND,
-				 DGFactory.eINSTANCE.createClosePath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATH__COMMAND,
-				 DGFactory.eINSTANCE.createCubicCurveTo()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATH__COMMAND,
-				 DGFactory.eINSTANCE.createEllipticalArcTo()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATH__COMMAND,
-				 DGFactory.eINSTANCE.createQuadraticCurveTo()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATH__COMMAND,
-				 DGFactory.eINSTANCE.createLineTo()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createMoveTo()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createClosePath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createCubicCurveTo()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createEllipticalArcTo()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createQuadraticCurveTo()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createLineTo()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java
index bed0e44561e..d173e1c5c85 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.dd.dg.Pattern;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Pattern} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class PatternItemProvider extends PaintServerItemProvider {
@@ -49,9 +50,8 @@ public class PatternItemProvider extends PaintServerItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -61,11 +61,12 @@ public class PatternItemProvider extends PaintServerItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.PATTERN__BOUNDS);
 			childrenFeatures.add(DGPackage.Literals.PATTERN__TILE);
@@ -75,19 +76,20 @@ public class PatternItemProvider extends PaintServerItemProvider {
 
 	/**
 	 * <!-- 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 Pattern.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,14 +101,13 @@ public class PatternItemProvider extends PaintServerItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Pattern)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Pattern_type") :
-			getString("_UI_Pattern_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Pattern_type") : getString("_UI_Pattern_type") + " " + label;
 	}
 
 	/**
@@ -114,17 +115,17 @@ public class PatternItemProvider extends PaintServerItemProvider {
 	 * 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(Pattern.class)) {
-			case DGPackage.PATTERN__BOUNDS:
-			case DGPackage.PATTERN__TILE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Pattern.class)) {
+		case DGPackage.PATTERN__BOUNDS:
+		case DGPackage.PATTERN__TILE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -139,85 +140,21 @@ public class PatternItemProvider extends PaintServerItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createGroup()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createCanvas()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createClipPath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createCircle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createEllipse()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createImage()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createLine()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createMarker()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createPath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createPolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createPolyline()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createRootCanvas()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createText()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createUse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__BOUNDS, DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createGroup()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createClipPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createCircle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createEllipse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createImage()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createLine()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createMarker()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createPolygon()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createPolyline()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createRectangle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createRootCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createText()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createUse()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java
index dadfd047fca..edcff7dca79 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.Polygon;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Polygon} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class PolygonItemProvider extends MarkedElementItemProvider {
@@ -48,9 +49,8 @@ public class PolygonItemProvider extends MarkedElementItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class PolygonItemProvider extends MarkedElementItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.POLYGON__POINT);
 		}
@@ -73,19 +74,20 @@ public class PolygonItemProvider extends MarkedElementItemProvider {
 
 	/**
 	 * <!-- 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 Polygon.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,14 +99,13 @@ public class PolygonItemProvider extends MarkedElementItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Polygon)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Polygon_type") :
-			getString("_UI_Polygon_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Polygon_type") : getString("_UI_Polygon_type") + " " + label;
 	}
 
 	/**
@@ -112,16 +113,16 @@ public class PolygonItemProvider extends MarkedElementItemProvider {
 	 * 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(Polygon.class)) {
-			case DGPackage.POLYGON__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Polygon.class)) {
+		case DGPackage.POLYGON__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -136,10 +137,6 @@ public class PolygonItemProvider extends MarkedElementItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.POLYGON__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.POLYGON__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java
index e9e330def39..3b458958e26 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.Polyline;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Polyline} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class PolylineItemProvider extends MarkedElementItemProvider {
@@ -48,9 +49,8 @@ public class PolylineItemProvider extends MarkedElementItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +60,12 @@ public class PolylineItemProvider extends MarkedElementItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.POLYLINE__POINT);
 		}
@@ -73,19 +74,20 @@ public class PolylineItemProvider extends MarkedElementItemProvider {
 
 	/**
 	 * <!-- 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 Polyline.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,14 +99,13 @@ public class PolylineItemProvider extends MarkedElementItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Polyline)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Polyline_type") :
-			getString("_UI_Polyline_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Polyline_type") : getString("_UI_Polyline_type") + " " + label;
 	}
 
 	/**
@@ -112,16 +113,16 @@ public class PolylineItemProvider extends MarkedElementItemProvider {
 	 * 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(Polyline.class)) {
-			case DGPackage.POLYLINE__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Polyline.class)) {
+		case DGPackage.POLYLINE__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -136,10 +137,6 @@ public class PolylineItemProvider extends MarkedElementItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.POLYLINE__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.POLYLINE__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java
index 9b3f558e071..2e1da913ff8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java
@@ -48,9 +48,8 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -60,11 +59,12 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL);
 			childrenFeatures.add(DGPackage.Literals.QUADRATIC_CURVE_TO__POINT);
@@ -74,13 +74,13 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider {
 
 	/**
 	 * <!-- 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);
 	}
 
@@ -88,6 +88,7 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider {
 	 * This returns QuadraticCurveTo.gif.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,6 +100,7 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,17 +114,17 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider {
 	 * 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(QuadraticCurveTo.class)) {
-			case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-			case DGPackage.QUADRATIC_CURVE_TO__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(QuadraticCurveTo.class)) {
+		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
+		case DGPackage.QUADRATIC_CURVE_TO__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -137,16 +139,8 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.QUADRATIC_CURVE_TO__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.QUADRATIC_CURVE_TO__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
 
 	/**
@@ -159,15 +153,9 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider {
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
-
-		boolean qualify =
-			childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL ||
-			childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__POINT;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		boolean qualify = childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL || childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__POINT;
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java
index a531fddc4d0..ea1a9402401 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.dd.dg.RadialGradient;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.RadialGradient} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class RadialGradientItemProvider extends GradientItemProvider {
@@ -50,9 +51,8 @@ public class RadialGradientItemProvider extends GradientItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addRadiusPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -65,19 +65,7 @@ public class RadialGradientItemProvider extends GradientItemProvider {
 	 * @generated
 	 */
 	protected void addRadiusPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RadialGradient_radius_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RadialGradient_radius_feature", "_UI_RadialGradient_type"),
-				 DGPackage.Literals.RADIAL_GRADIENT__RADIUS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RadialGradient_radius_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RadialGradient_radius_feature", "_UI_RadialGradient_type"), DGPackage.Literals.RADIAL_GRADIENT__RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -85,11 +73,12 @@ public class RadialGradientItemProvider extends GradientItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.RADIAL_GRADIENT__CENTER);
 			childrenFeatures.add(DGPackage.Literals.RADIAL_GRADIENT__FOCUS);
@@ -99,13 +88,13 @@ public class RadialGradientItemProvider extends GradientItemProvider {
 
 	/**
 	 * <!-- 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);
 	}
 
@@ -113,6 +102,7 @@ public class RadialGradientItemProvider extends GradientItemProvider {
 	 * This returns RadialGradient.gif.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -124,14 +114,13 @@ public class RadialGradientItemProvider extends GradientItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((RadialGradient)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_RadialGradient_type") :
-			getString("_UI_RadialGradient_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_RadialGradient_type") : getString("_UI_RadialGradient_type") + " " + label;
 	}
 
 	/**
@@ -139,20 +128,20 @@ public class RadialGradientItemProvider extends GradientItemProvider {
 	 * 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(RadialGradient.class)) {
-			case DGPackage.RADIAL_GRADIENT__RADIUS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.RADIAL_GRADIENT__CENTER:
-			case DGPackage.RADIAL_GRADIENT__FOCUS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(RadialGradient.class)) {
+		case DGPackage.RADIAL_GRADIENT__RADIUS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.RADIAL_GRADIENT__CENTER:
+		case DGPackage.RADIAL_GRADIENT__FOCUS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -167,16 +156,8 @@ public class RadialGradientItemProvider extends GradientItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.RADIAL_GRADIENT__CENTER,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.RADIAL_GRADIENT__FOCUS,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.RADIAL_GRADIENT__CENTER, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.RADIAL_GRADIENT__FOCUS, DCFactory.eINSTANCE.createPoint()));
 	}
 
 	/**
@@ -189,15 +170,9 @@ public class RadialGradientItemProvider extends GradientItemProvider {
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
-
-		boolean qualify =
-			childFeature == DGPackage.Literals.RADIAL_GRADIENT__CENTER ||
-			childFeature == DGPackage.Literals.RADIAL_GRADIENT__FOCUS;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		boolean qualify = childFeature == DGPackage.Literals.RADIAL_GRADIENT__CENTER || childFeature == DGPackage.Literals.RADIAL_GRADIENT__FOCUS;
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java
index 39a3156a6f1..f757077b0e4 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.dd.dg.Rectangle;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Rectangle} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class RectangleItemProvider extends GraphicalElementItemProvider {
@@ -50,9 +51,8 @@ public class RectangleItemProvider extends GraphicalElementItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addCornerRadiusPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -65,19 +65,7 @@ public class RectangleItemProvider extends GraphicalElementItemProvider {
 	 * @generated
 	 */
 	protected void addCornerRadiusPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Rectangle_cornerRadius_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Rectangle_cornerRadius_feature", "_UI_Rectangle_type"),
-				 DGPackage.Literals.RECTANGLE__CORNER_RADIUS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rectangle_cornerRadius_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Rectangle_cornerRadius_feature", "_UI_Rectangle_type"), DGPackage.Literals.RECTANGLE__CORNER_RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -85,11 +73,12 @@ public class RectangleItemProvider extends GraphicalElementItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.RECTANGLE__BOUNDS);
 		}
@@ -98,19 +87,20 @@ public class RectangleItemProvider extends GraphicalElementItemProvider {
 
 	/**
 	 * <!-- 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 Rectangle.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -122,14 +112,13 @@ public class RectangleItemProvider extends GraphicalElementItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Rectangle)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Rectangle_type") :
-			getString("_UI_Rectangle_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Rectangle_type") : getString("_UI_Rectangle_type") + " " + label;
 	}
 
 	/**
@@ -137,19 +126,19 @@ public class RectangleItemProvider extends GraphicalElementItemProvider {
 	 * 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(Rectangle.class)) {
-			case DGPackage.RECTANGLE__CORNER_RADIUS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.RECTANGLE__BOUNDS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Rectangle.class)) {
+		case DGPackage.RECTANGLE__CORNER_RADIUS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.RECTANGLE__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -164,10 +153,6 @@ public class RectangleItemProvider extends GraphicalElementItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.RECTANGLE__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.RECTANGLE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
index e9a529a6cfd..346c01fab9e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.dd.dg.RootCanvas;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.RootCanvas} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class RootCanvasItemProvider extends CanvasItemProvider {
@@ -50,9 +51,8 @@ public class RootCanvasItemProvider extends CanvasItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addBackgroundColorPropertyDescriptor(object);
 			addExternalStyleSheetPropertyDescriptor(object);
 		}
@@ -66,40 +66,17 @@ public class RootCanvasItemProvider extends CanvasItemProvider {
 	 * @generated
 	 */
 	protected void addBackgroundColorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RootCanvas_backgroundColor_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_backgroundColor_feature", "_UI_RootCanvas_type"),
-				 DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_backgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_backgroundColor_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the External Style Sheet feature.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addExternalStyleSheetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RootCanvas_externalStyleSheet_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_externalStyleSheet_feature", "_UI_RootCanvas_type"),
-				 DGPackage.Literals.ROOT_CANVAS__EXTERNAL_STYLE_SHEET,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_externalStyleSheet_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_externalStyleSheet_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__EXTERNAL_STYLE_SHEET, true, false, true, null, null, null));
 	}
 
 	/**
@@ -107,11 +84,12 @@ public class RootCanvasItemProvider extends CanvasItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.ROOT_CANVAS__DEFINITIONS);
 		}
@@ -120,13 +98,13 @@ public class RootCanvasItemProvider extends CanvasItemProvider {
 
 	/**
 	 * <!-- 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);
 	}
 
@@ -145,14 +123,13 @@ public class RootCanvasItemProvider extends CanvasItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((RootCanvas)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_RootCanvas_type") :
-			getString("_UI_RootCanvas_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_RootCanvas_type") : getString("_UI_RootCanvas_type") + " " + label;
 	}
 
 	/**
@@ -160,19 +137,19 @@ public class RootCanvasItemProvider extends CanvasItemProvider {
 	 * 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(RootCanvas.class)) {
-			case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.ROOT_CANVAS__DEFINITIONS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(RootCanvas.class)) {
+		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.ROOT_CANVAS__DEFINITIONS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -187,10 +164,6 @@ public class RootCanvasItemProvider extends CanvasItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.ROOT_CANVAS__DEFINITIONS,
-				 DGFactory.eINSTANCE.createDefinitions()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.ROOT_CANVAS__DEFINITIONS, DGFactory.eINSTANCE.createDefinitions()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java
index 39a72c94f42..662bba00178 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.dd.dg.Rotate;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Rotate} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class RotateItemProvider extends TransformItemProvider {
@@ -50,9 +51,8 @@ public class RotateItemProvider extends TransformItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addAnglePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -65,19 +65,7 @@ public class RotateItemProvider extends TransformItemProvider {
 	 * @generated
 	 */
 	protected void addAnglePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Rotate_angle_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Rotate_angle_feature", "_UI_Rotate_type"),
-				 DGPackage.Literals.ROTATE__ANGLE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rotate_angle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Rotate_angle_feature", "_UI_Rotate_type"), DGPackage.Literals.ROTATE__ANGLE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -85,11 +73,12 @@ public class RotateItemProvider extends TransformItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.ROTATE__CENTER);
 		}
@@ -98,19 +87,20 @@ public class RotateItemProvider extends TransformItemProvider {
 
 	/**
 	 * <!-- 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 Rotate.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -122,6 +112,7 @@ public class RotateItemProvider extends TransformItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -135,19 +126,19 @@ public class RotateItemProvider extends TransformItemProvider {
 	 * 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(Rotate.class)) {
-			case DGPackage.ROTATE__ANGLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.ROTATE__CENTER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Rotate.class)) {
+		case DGPackage.ROTATE__ANGLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.ROTATE__CENTER:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -162,10 +153,6 @@ public class RotateItemProvider extends TransformItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.ROTATE__CENTER,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.ROTATE__CENTER, DCFactory.eINSTANCE.createPoint()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java
index ec5b5317e5f..655a4f3a829 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.Scale;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Scale} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class ScaleItemProvider extends TransformItemProvider {
@@ -48,9 +49,8 @@ public class ScaleItemProvider extends TransformItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addFactorXPropertyDescriptor(object);
 			addFactorYPropertyDescriptor(object);
 		}
@@ -64,19 +64,7 @@ public class ScaleItemProvider extends TransformItemProvider {
 	 * @generated
 	 */
 	protected void addFactorXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Scale_factorX_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorX_feature", "_UI_Scale_type"),
-				 DGPackage.Literals.SCALE__FACTOR_X,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Scale_factorX_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorX_feature", "_UI_Scale_type"), DGPackage.Literals.SCALE__FACTOR_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -86,24 +74,13 @@ public class ScaleItemProvider extends TransformItemProvider {
 	 * @generated
 	 */
 	protected void addFactorYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Scale_factorY_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorY_feature", "_UI_Scale_type"),
-				 DGPackage.Literals.SCALE__FACTOR_Y,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Scale_factorY_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorY_feature", "_UI_Scale_type"), DGPackage.Literals.SCALE__FACTOR_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns Scale.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -115,6 +92,7 @@ public class ScaleItemProvider extends TransformItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,17 +106,17 @@ public class ScaleItemProvider extends TransformItemProvider {
 	 * 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(Scale.class)) {
-			case DGPackage.SCALE__FACTOR_X:
-			case DGPackage.SCALE__FACTOR_Y:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Scale.class)) {
+		case DGPackage.SCALE__FACTOR_X:
+		case DGPackage.SCALE__FACTOR_Y:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java
index 67cd8b3b82c..df62a7d141c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.Skew;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Skew} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class SkewItemProvider extends TransformItemProvider {
@@ -48,9 +49,8 @@ public class SkewItemProvider extends TransformItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addAngleXPropertyDescriptor(object);
 			addAngleYPropertyDescriptor(object);
 		}
@@ -64,19 +64,7 @@ public class SkewItemProvider extends TransformItemProvider {
 	 * @generated
 	 */
 	protected void addAngleXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Skew_angleX_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleX_feature", "_UI_Skew_type"),
-				 DGPackage.Literals.SKEW__ANGLE_X,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Skew_angleX_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleX_feature", "_UI_Skew_type"), DGPackage.Literals.SKEW__ANGLE_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -86,24 +74,13 @@ public class SkewItemProvider extends TransformItemProvider {
 	 * @generated
 	 */
 	protected void addAngleYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Skew_angleY_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleY_feature", "_UI_Skew_type"),
-				 DGPackage.Literals.SKEW__ANGLE_Y,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Skew_angleY_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleY_feature", "_UI_Skew_type"), DGPackage.Literals.SKEW__ANGLE_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns Skew.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -115,6 +92,7 @@ public class SkewItemProvider extends TransformItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,17 +106,17 @@ public class SkewItemProvider extends TransformItemProvider {
 	 * 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(Skew.class)) {
-			case DGPackage.SKEW__ANGLE_X:
-			case DGPackage.SKEW__ANGLE_Y:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Skew.class)) {
+		case DGPackage.SKEW__ANGLE_X:
+		case DGPackage.SKEW__ANGLE_Y:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java
index 5a50a7835e4..df433b21345 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java
@@ -38,6 +38,7 @@ import org.eclipse.papyrus.dd.provider.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Style} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class StyleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
@@ -60,9 +61,8 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addFillPropertyDescriptor(object);
 			addFillOpacityPropertyDescriptor(object);
 			addStrokePropertyDescriptor(object);
@@ -82,22 +82,11 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * This adds a property descriptor for the Fill feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addFillPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fill_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fill_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FILL,
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fill_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fill_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FILL, true, false, false, null, null, null));
 	}
 
 	/**
@@ -107,19 +96,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFillOpacityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fillOpacity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fillOpacity_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FILL_OPACITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fillOpacity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fillOpacity_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FILL_OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -129,19 +106,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addStrokePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_stroke_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_stroke_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__STROKE,
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_stroke_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_stroke_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE, true, false, false, null, null, null));
 	}
 
 	/**
@@ -151,19 +116,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addStrokeWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_strokeWidth_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeWidth_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__STROKE_WIDTH,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeWidth_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeWidth_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -173,19 +126,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addStrokeOpacityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_strokeOpacity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeOpacity_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__STROKE_OPACITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeOpacity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeOpacity_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -195,19 +136,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addStrokeDashLengthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_strokeDashLength_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeDashLength_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__STROKE_DASH_LENGTH,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeDashLength_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeDashLength_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_DASH_LENGTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -217,19 +146,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFontSizePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fontSize_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fontSize_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FONT_SIZE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontSize_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -239,19 +156,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFontNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fontName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fontName_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FONT_NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontName_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -261,19 +166,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFontItalicPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fontItalic_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fontItalic_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FONT_ITALIC,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontItalic_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontItalic_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -283,19 +176,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFontBoldPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fontBold_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fontBold_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FONT_BOLD,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontBold_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontBold_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -305,19 +186,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * @generated
 	 */
 	protected void addFontDecorationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fontDecoration_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fontDecoration_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FONT_DECORATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontDecoration_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontDecoration_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_DECORATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -325,11 +194,12 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.STYLE__FILL);
 			childrenFeatures.add(DGPackage.Literals.STYLE__STROKE);
@@ -339,19 +209,20 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 
 	/**
 	 * <!-- 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 Style.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -363,14 +234,13 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Style)object).getFontName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Style_type") :
-			getString("_UI_Style_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Style_type") : getString("_UI_Style_type") + " " + label;
 	}
 
 	/**
@@ -378,28 +248,28 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	 * 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(Style.class)) {
-			case DGPackage.STYLE__FILL_OPACITY:
-			case DGPackage.STYLE__STROKE_WIDTH:
-			case DGPackage.STYLE__STROKE_OPACITY:
-			case DGPackage.STYLE__STROKE_DASH_LENGTH:
-			case DGPackage.STYLE__FONT_SIZE:
-			case DGPackage.STYLE__FONT_NAME:
-			case DGPackage.STYLE__FONT_ITALIC:
-			case DGPackage.STYLE__FONT_BOLD:
-			case DGPackage.STYLE__FONT_DECORATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.STYLE__FILL:
-			case DGPackage.STYLE__STROKE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Style.class)) {
+		case DGPackage.STYLE__FILL_OPACITY:
+		case DGPackage.STYLE__STROKE_WIDTH:
+		case DGPackage.STYLE__STROKE_OPACITY:
+		case DGPackage.STYLE__STROKE_DASH_LENGTH:
+		case DGPackage.STYLE__FONT_SIZE:
+		case DGPackage.STYLE__FONT_NAME:
+		case DGPackage.STYLE__FONT_ITALIC:
+		case DGPackage.STYLE__FONT_BOLD:
+		case DGPackage.STYLE__FONT_DECORATION:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.STYLE__FILL:
+		case DGPackage.STYLE__STROKE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -414,16 +284,8 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.STYLE__FILL,
-				 DGFactory.eINSTANCE.createPaint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.STYLE__STROKE,
-				 DGFactory.eINSTANCE.createPaint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE__FILL, DGFactory.eINSTANCE.createPaint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE__STROKE, DGFactory.eINSTANCE.createPaint()));
 	}
 
 	/**
@@ -436,15 +298,9 @@ public class StyleItemProvider extends ItemProviderAdapter implements IEditingDo
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
-
-		boolean qualify =
-			childFeature == DGPackage.Literals.STYLE__FILL ||
-			childFeature == DGPackage.Literals.STYLE__STROKE;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		boolean qualify = childFeature == DGPackage.Literals.STYLE__FILL || childFeature == DGPackage.Literals.STYLE__STROKE;
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java
index 15e7c349e11..d3881792a28 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java
@@ -36,6 +36,7 @@ import org.eclipse.papyrus.dd.provider.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.StyleRule} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
@@ -58,9 +59,8 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -70,11 +70,12 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditi
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.STYLE_RULE__SELECTOR);
 			childrenFeatures.add(DGPackage.Literals.STYLE_RULE__STYLE);
@@ -84,19 +85,20 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditi
 
 	/**
 	 * <!-- 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 StyleRule.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -108,6 +110,7 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -120,17 +123,17 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditi
 	 * 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(StyleRule.class)) {
-			case DGPackage.STYLE_RULE__SELECTOR:
-			case DGPackage.STYLE_RULE__STYLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(StyleRule.class)) {
+		case DGPackage.STYLE_RULE__SELECTOR:
+		case DGPackage.STYLE_RULE__STYLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -145,16 +148,8 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditi
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.STYLE_RULE__SELECTOR,
-				 DGFactory.eINSTANCE.createStyleSelector()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.STYLE_RULE__STYLE,
-				 DGFactory.eINSTANCE.createStyle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE_RULE__SELECTOR, DGFactory.eINSTANCE.createStyleSelector()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE_RULE__STYLE, DGFactory.eINSTANCE.createStyle()));
 	}
 
 	/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java
index 313595d6c48..806ded28eb1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java
@@ -37,6 +37,7 @@ import org.eclipse.papyrus.dd.provider.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSelector} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class StyleSelectorItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
@@ -59,9 +60,8 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addKindPropertyDescriptor(object);
 			addClassPropertyDescriptor(object);
 		}
@@ -72,22 +72,11 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
 	 * 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_StyleSelector_kind_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_kind_feature", "_UI_StyleSelector_type"),
-				 DGPackage.Literals.STYLE_SELECTOR__KIND,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StyleSelector_kind_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_kind_feature", "_UI_StyleSelector_type"), DGPackage.Literals.STYLE_SELECTOR__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -97,19 +86,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_StyleSelector_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_class_feature", "_UI_StyleSelector_type"),
-				 DGPackage.Literals.STYLE_SELECTOR__CLASS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StyleSelector_class_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_class_feature", "_UI_StyleSelector_type"), DGPackage.Literals.STYLE_SELECTOR__CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -127,15 +104,14 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		ElementKind labelValue = ((StyleSelector)object).getKind();
 		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_StyleSelector_type") :
-			getString("_UI_StyleSelector_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_StyleSelector_type") : getString("_UI_StyleSelector_type") + " " + label;
 	}
 
 	/**
@@ -143,17 +119,17 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements IE
 	 * 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(StyleSelector.class)) {
-			case DGPackage.STYLE_SELECTOR__KIND:
-			case DGPackage.STYLE_SELECTOR__CLASS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(StyleSelector.class)) {
+		case DGPackage.STYLE_SELECTOR__KIND:
+		case DGPackage.STYLE_SELECTOR__CLASS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java
index 58533695ed4..e979ef17685 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java
@@ -36,6 +36,7 @@ import org.eclipse.papyrus.dd.provider.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSheet} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class StyleSheetItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
@@ -58,9 +59,8 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements IEdit
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -70,11 +70,12 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements IEdit
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.STYLE_SHEET__RULE);
 		}
@@ -83,13 +84,13 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements IEdit
 
 	/**
 	 * <!-- 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);
 	}
 
@@ -108,6 +109,7 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements IEdit
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -120,16 +122,16 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements IEdit
 	 * 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(StyleSheet.class)) {
-			case DGPackage.STYLE_SHEET__RULE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(StyleSheet.class)) {
+		case DGPackage.STYLE_SHEET__RULE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -144,11 +146,7 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements IEdit
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.STYLE_SHEET__RULE,
-				 DGFactory.eINSTANCE.createStyleRule()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE_SHEET__RULE, DGFactory.eINSTANCE.createStyleRule()));
 	}
 
 	/**
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java
index ce001478387..eb9fad3f319 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java
@@ -28,6 +28,7 @@ import org.eclipse.papyrus.dd.dg.Text;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Text} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class TextItemProvider extends GraphicalElementItemProvider {
@@ -50,9 +51,8 @@ public class TextItemProvider extends GraphicalElementItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addDataPropertyDescriptor(object);
 			addAnchorPropertyDescriptor(object);
 		}
@@ -63,44 +63,22 @@ public class TextItemProvider extends GraphicalElementItemProvider {
 	 * This adds a property descriptor for the Data feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDataPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Text_data_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Text_data_feature", "_UI_Text_type"),
-				 DGPackage.Literals.TEXT__DATA,
-				 true,
-				 true,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Text_data_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Text_data_feature", "_UI_Text_type"), DGPackage.Literals.TEXT__DATA, true, true, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * 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));
+		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));
 	}
 
 	/**
@@ -108,11 +86,12 @@ public class TextItemProvider extends GraphicalElementItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.TEXT__BOUNDS);
 		}
@@ -121,19 +100,20 @@ public class TextItemProvider extends GraphicalElementItemProvider {
 
 	/**
 	 * <!-- 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 Text.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -145,14 +125,13 @@ public class TextItemProvider extends GraphicalElementItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Text)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Text_type") :
-			getString("_UI_Text_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Text_type") : getString("_UI_Text_type") + " " + label;
 	}
 
 	/**
@@ -160,20 +139,20 @@ public class TextItemProvider extends GraphicalElementItemProvider {
 	 * 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(Text.class)) {
-			case DGPackage.TEXT__DATA:
-			case DGPackage.TEXT__ANCHOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.TEXT__BOUNDS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		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__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -188,10 +167,6 @@ public class TextItemProvider extends GraphicalElementItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.TEXT__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.TEXT__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java
index 3cce01d5579..1bc74ab8dde 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java
@@ -31,6 +31,7 @@ import org.eclipse.papyrus.dd.provider.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Transform} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class TransformItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
@@ -53,9 +54,8 @@ public class TransformItemProvider extends ItemProviderAdapter implements IEditi
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -64,6 +64,7 @@ public class TransformItemProvider extends ItemProviderAdapter implements IEditi
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,6 +77,7 @@ public class TransformItemProvider extends ItemProviderAdapter implements IEditi
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java
index abaa1c3148b..2a3b469ba3f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.Translate;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Translate} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class TranslateItemProvider extends TransformItemProvider {
@@ -48,9 +49,8 @@ public class TranslateItemProvider extends TransformItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addDeltaXPropertyDescriptor(object);
 			addDeltaYPropertyDescriptor(object);
 		}
@@ -64,19 +64,7 @@ public class TranslateItemProvider extends TransformItemProvider {
 	 * @generated
 	 */
 	protected void addDeltaXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Translate_deltaX_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaX_feature", "_UI_Translate_type"),
-				 DGPackage.Literals.TRANSLATE__DELTA_X,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Translate_deltaX_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaX_feature", "_UI_Translate_type"), DGPackage.Literals.TRANSLATE__DELTA_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -86,24 +74,13 @@ public class TranslateItemProvider extends TransformItemProvider {
 	 * @generated
 	 */
 	protected void addDeltaYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Translate_deltaY_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaY_feature", "_UI_Translate_type"),
-				 DGPackage.Literals.TRANSLATE__DELTA_Y,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Translate_deltaY_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaY_feature", "_UI_Translate_type"), DGPackage.Literals.TRANSLATE__DELTA_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns Translate.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -115,6 +92,7 @@ public class TranslateItemProvider extends TransformItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,17 +106,17 @@ public class TranslateItemProvider extends TransformItemProvider {
 	 * 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(Translate.class)) {
-			case DGPackage.TRANSLATE__DELTA_X:
-			case DGPackage.TRANSLATE__DELTA_Y:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Translate.class)) {
+		case DGPackage.TRANSLATE__DELTA_X:
+		case DGPackage.TRANSLATE__DELTA_Y:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java
index 066ed556e5b..712044b850a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src-gen/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.dd.dg.Use;
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Use} object.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class UseItemProvider extends GraphicalElementItemProvider {
@@ -48,9 +49,8 @@ public class UseItemProvider extends GraphicalElementItemProvider {
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addReferencedElementPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -63,19 +63,7 @@ public class UseItemProvider extends GraphicalElementItemProvider {
 	 * @generated
 	 */
 	protected void addReferencedElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Use_referencedElement_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Use_referencedElement_feature", "_UI_Use_type"),
-				 DGPackage.Literals.USE__REFERENCED_ELEMENT,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Use_referencedElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Use_referencedElement_feature", "_UI_Use_type"), DGPackage.Literals.USE__REFERENCED_ELEMENT, true, false, true, null, null, null));
 	}
 
 	/**
@@ -83,11 +71,12 @@ public class UseItemProvider extends GraphicalElementItemProvider {
 	 * {@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) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.USE__BOUNDS);
 		}
@@ -96,19 +85,20 @@ public class UseItemProvider extends GraphicalElementItemProvider {
 
 	/**
 	 * <!-- 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 Use.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -120,14 +110,13 @@ public class UseItemProvider extends GraphicalElementItemProvider {
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Use)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Use_type") :
-			getString("_UI_Use_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Use_type") : getString("_UI_Use_type") + " " + label;
 	}
 
 	/**
@@ -135,16 +124,16 @@ public class UseItemProvider extends GraphicalElementItemProvider {
 	 * 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(Use.class)) {
-			case DGPackage.USE__BOUNDS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Use.class)) {
+		case DGPackage.USE__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -159,10 +148,6 @@ public class UseItemProvider extends GraphicalElementItemProvider {
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.USE__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.USE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
 }