Merge branch 'master' into bugs/462954-alf

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

1 files changed, 54 insertions, 46 deletions

diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src-gen/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src-gen/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java
index f4a5b38b826..5591d2a5ecc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src-gen/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src-gen/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java
@@ -36,8 +36,8 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl#getFactorX <em>Factor X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl#getFactorY <em>Factor Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl#getFactorX <em>Factor X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl#getFactorY <em>Factor Y</em>}</li>
  * </ul>
  *
  * @generated
@@ -47,6 +47,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	/**
 	 * The default value of the '{@link #getFactorX() <em>Factor X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFactorX()
 	 * @generated
 	 * @ordered
@@ -56,6 +57,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	/**
 	 * The cached value of the '{@link #getFactorX() <em>Factor X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFactorX()
 	 * @generated
 	 * @ordered
@@ -65,6 +67,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	/**
 	 * The default value of the '{@link #getFactorY() <em>Factor Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFactorY()
 	 * @generated
 	 * @ordered
@@ -74,6 +77,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	/**
 	 * The cached value of the '{@link #getFactorY() <em>Factor Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFactorY()
 	 * @generated
 	 * @ordered
@@ -82,6 +86,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ScaleImpl() {
@@ -90,6 +95,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,6 +105,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getFactorX() {
@@ -107,17 +114,19 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFactorX(double newFactorX) {
 		double oldFactorX = factorX;
 		factorX = newFactorX;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SCALE__FACTOR_X, oldFactorX, factorX));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getFactorY() {
@@ -126,19 +135,22 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFactorY(double newFactorY) {
 		double oldFactorY = factorY;
 		factorY = newFactorY;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SCALE__FACTOR_Y, oldFactorY, factorY));
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Nonnegativescale</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Nonnegativescale</em>}' invariant operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -147,109 +159,105 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean nonnegativescale(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.SCALE,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP,
-				 NONNEGATIVESCALE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.SCALE__NONNEGATIVESCALE);
+		return DGValidator.validate(DGPackage.Literals.SCALE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP, NONNEGATIVESCALE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.SCALE__NONNEGATIVESCALE);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.SCALE__FACTOR_X:
-				return getFactorX();
-			case DGPackage.SCALE__FACTOR_Y:
-				return getFactorY();
+		switch(featureID) {
+		case DGPackage.SCALE__FACTOR_X:
+			return getFactorX();
+		case DGPackage.SCALE__FACTOR_Y:
+			return getFactorY();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.SCALE__FACTOR_X:
-				setFactorX((Double)newValue);
-				return;
-			case DGPackage.SCALE__FACTOR_Y:
-				setFactorY((Double)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.SCALE__FACTOR_X:
+			setFactorX((Double)newValue);
+			return;
+		case DGPackage.SCALE__FACTOR_Y:
+			setFactorY((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.SCALE__FACTOR_X:
-				setFactorX(FACTOR_X_EDEFAULT);
-				return;
-			case DGPackage.SCALE__FACTOR_Y:
-				setFactorY(FACTOR_Y_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.SCALE__FACTOR_X:
+			setFactorX(FACTOR_X_EDEFAULT);
+			return;
+		case DGPackage.SCALE__FACTOR_Y:
+			setFactorY(FACTOR_Y_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.SCALE__FACTOR_X:
-				return factorX != FACTOR_X_EDEFAULT;
-			case DGPackage.SCALE__FACTOR_Y:
-				return factorY != FACTOR_Y_EDEFAULT;
+		switch(featureID) {
+		case DGPackage.SCALE__FACTOR_X:
+			return factorX != FACTOR_X_EDEFAULT;
+		case DGPackage.SCALE__FACTOR_Y:
+			return factorY != FACTOR_Y_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP:
-				return nonnegativescale((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		switch(operationID) {
+		case DGPackage.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP:
+			return nonnegativescale((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (factorX: ");
 		result.append(factorX);