1 files changed, 110 insertions, 107 deletions

diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src-gen/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src-gen/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java
index b522d163142..cb91f3da7e0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src-gen/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src-gen/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java
@@ -39,9 +39,9 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getCenter <em>Center</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getFocus <em>Focus</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getRadius <em>Radius</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getCenter <em>Center</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getFocus <em>Focus</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getRadius <em>Radius</em>}</li>
  * </ul>
  *
  * @generated
@@ -51,6 +51,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	/**
 	 * The cached value of the '{@link #getCenter() <em>Center</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCenter()
 	 * @generated
 	 * @ordered
@@ -60,6 +61,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	/**
 	 * The cached value of the '{@link #getFocus() <em>Focus</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFocus()
 	 * @generated
 	 * @ordered
@@ -69,6 +71,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	/**
 	 * The default value of the '{@link #getRadius() <em>Radius</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRadius()
 	 * @generated
 	 * @ordered
@@ -78,6 +81,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	/**
 	 * The cached value of the '{@link #getRadius() <em>Radius</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRadius()
 	 * @generated
 	 * @ordered
@@ -86,6 +90,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RadialGradientImpl() {
@@ -94,6 +99,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -103,6 +109,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getCenter() {
@@ -111,38 +118,44 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetCenter(Point newCenter, NotificationChain msgs) {
 		Point oldCenter = center;
 		center = newCenter;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__CENTER, oldCenter, newCenter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCenter(Point newCenter) {
-		if (newCenter != center) {
+		if(newCenter != center) {
 			NotificationChain msgs = null;
-			if (center != null)
+			if(center != null)
 				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__CENTER, null, msgs);
-			if (newCenter != null)
+			if(newCenter != null)
 				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__CENTER, null, msgs);
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__CENTER, newCenter, newCenter));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getFocus() {
@@ -151,38 +164,44 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetFocus(Point newFocus, NotificationChain msgs) {
 		Point oldFocus = focus;
 		focus = newFocus;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__FOCUS, oldFocus, newFocus);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFocus(Point newFocus) {
-		if (newFocus != focus) {
+		if(newFocus != focus) {
 			NotificationChain msgs = null;
-			if (focus != null)
+			if(focus != null)
 				msgs = ((InternalEObject)focus).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__FOCUS, null, msgs);
-			if (newFocus != null)
+			if(newFocus != null)
 				msgs = ((InternalEObject)newFocus).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__FOCUS, null, msgs);
 			msgs = basicSetFocus(newFocus, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__FOCUS, newFocus, newFocus));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getRadius() {
@@ -191,19 +210,22 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRadius(double newRadius) {
 		double oldRadius = radius;
 		radius = newRadius;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__RADIUS, oldRadius, radius));
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Center Point</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Center Point</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -212,27 +234,19 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validCenterPoint(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.RADIAL_GRADIENT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP,
-				 VALID_CENTER_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.RADIAL_GRADIENT__VALID_CENTER_POINT);
+		return DGValidator.validate(DGPackage.Literals.RADIAL_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP, VALID_CENTER_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RADIAL_GRADIENT__VALID_CENTER_POINT);
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Focus Point</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Focus Point</em>}' invariant operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -241,27 +255,19 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validFocusPoint(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.RADIAL_GRADIENT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP,
-				 VALID_FOCUS_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.RADIAL_GRADIENT__VALID_FOCUS_POINT);
+		return DGValidator.validate(DGPackage.Literals.RADIAL_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP, VALID_FOCUS_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RADIAL_GRADIENT__VALID_FOCUS_POINT);
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Radius</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Radius</em>}' invariant operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -270,138 +276,135 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validRadius(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.RADIAL_GRADIENT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP,
-				 VALID_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.RADIAL_GRADIENT__VALID_RADIUS);
+		return DGValidator.validate(DGPackage.Literals.RADIAL_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP, VALID_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RADIAL_GRADIENT__VALID_RADIUS);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.RADIAL_GRADIENT__CENTER:
-				return basicSetCenter(null, msgs);
-			case DGPackage.RADIAL_GRADIENT__FOCUS:
-				return basicSetFocus(null, msgs);
+		switch(featureID) {
+		case DGPackage.RADIAL_GRADIENT__CENTER:
+			return basicSetCenter(null, msgs);
+		case DGPackage.RADIAL_GRADIENT__FOCUS:
+			return basicSetFocus(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.RADIAL_GRADIENT__CENTER:
-				return getCenter();
-			case DGPackage.RADIAL_GRADIENT__FOCUS:
-				return getFocus();
-			case DGPackage.RADIAL_GRADIENT__RADIUS:
-				return getRadius();
+		switch(featureID) {
+		case DGPackage.RADIAL_GRADIENT__CENTER:
+			return getCenter();
+		case DGPackage.RADIAL_GRADIENT__FOCUS:
+			return getFocus();
+		case DGPackage.RADIAL_GRADIENT__RADIUS:
+			return getRadius();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.RADIAL_GRADIENT__CENTER:
-				setCenter((Point)newValue);
-				return;
-			case DGPackage.RADIAL_GRADIENT__FOCUS:
-				setFocus((Point)newValue);
-				return;
-			case DGPackage.RADIAL_GRADIENT__RADIUS:
-				setRadius((Double)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.RADIAL_GRADIENT__CENTER:
+			setCenter((Point)newValue);
+			return;
+		case DGPackage.RADIAL_GRADIENT__FOCUS:
+			setFocus((Point)newValue);
+			return;
+		case DGPackage.RADIAL_GRADIENT__RADIUS:
+			setRadius((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.RADIAL_GRADIENT__CENTER:
-				setCenter((Point)null);
-				return;
-			case DGPackage.RADIAL_GRADIENT__FOCUS:
-				setFocus((Point)null);
-				return;
-			case DGPackage.RADIAL_GRADIENT__RADIUS:
-				setRadius(RADIUS_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.RADIAL_GRADIENT__CENTER:
+			setCenter((Point)null);
+			return;
+		case DGPackage.RADIAL_GRADIENT__FOCUS:
+			setFocus((Point)null);
+			return;
+		case DGPackage.RADIAL_GRADIENT__RADIUS:
+			setRadius(RADIUS_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.RADIAL_GRADIENT__CENTER:
-				return center != null;
-			case DGPackage.RADIAL_GRADIENT__FOCUS:
-				return focus != null;
-			case DGPackage.RADIAL_GRADIENT__RADIUS:
-				return radius != RADIUS_EDEFAULT;
+		switch(featureID) {
+		case DGPackage.RADIAL_GRADIENT__CENTER:
+			return center != null;
+		case DGPackage.RADIAL_GRADIENT__FOCUS:
+			return focus != null;
+		case DGPackage.RADIAL_GRADIENT__RADIUS:
+			return radius != RADIUS_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP:
-				return validCenterPoint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DGPackage.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP:
-				return validFocusPoint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DGPackage.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP:
-				return validRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		switch(operationID) {
+		case DGPackage.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP:
+			return validCenterPoint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DGPackage.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP:
+			return validFocusPoint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DGPackage.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP:
+			return validRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (radius: ");
 		result.append(radius);