Merge remote-tracking branch 'origin/master' intobugs/441962-multipleXTextEditorsForUMLElements

bugs/441962-multipleXTextEditorsForUMLElements

Change-Id: I6d01c30bcfaa6169bec19e81ee31dfd2839f83c5
Signed-off-by: Gabriel Pascual <gabriel.pascual@all4tec.net>

1 files changed, 30 insertions, 29 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/DrawerConfigurationImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/DrawerConfigurationImpl.java
index 38ee34f7efe..0f28f3ae75c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/DrawerConfigurationImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.paletteconfiguration/src-gen/org/eclipse/papyrus/uml/diagram/paletteconfiguration/impl/DrawerConfigurationImpl.java
@@ -1,19 +1,29 @@
 /**

- * <copyright>

- * </copyright>

- *

- * $Id$

+ * Copyright (c) 2015 CEA LIST.

+ * 

+ * 

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *  CEA LIST - Initial API and implementation

  */

 package org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl;

 

 import java.util.Collection;

 

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

+

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

+

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.InternalEObject;

+

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

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

+

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.ChildConfiguration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.DrawerConfiguration;

 import org.eclipse.papyrus.uml.diagram.paletteconfiguration.PaletteconfigurationPackage;

@@ -24,10 +34,10 @@ import org.eclipse.papyrus.uml.diagram.paletteconfiguration.Paletteconfiguration
  * <!-- end-user-doc -->

  * <p>

  * The following features are implemented:

+ * </p>

  * <ul>

- * <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.DrawerConfigurationImpl#getOwnedConfigurations <em>Owned Configurations</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.diagram.paletteconfiguration.impl.DrawerConfigurationImpl#getOwnedConfigurations <em>Owned Configurations</em>}</li>

  * </ul>

- * </p>

  *

  * @generated

  */

@@ -36,7 +46,6 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	 * The cached value of the '{@link #getOwnedConfigurations() <em>Owned Configurations</em>}' containment reference list.

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

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

-	 *

 	 * @see #getOwnedConfigurations()

 	 * @generated

 	 * @ordered

@@ -46,7 +55,6 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

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

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

-	 *

 	 * @generated

 	 */

 	protected DrawerConfigurationImpl() {

@@ -56,7 +64,6 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

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

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

-	 *

 	 * @generated

 	 */

 	@Override

@@ -67,7 +74,6 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

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

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

-	 *

 	 * @generated

 	 */

 	public EList<ChildConfiguration> getOwnedConfigurations() {

@@ -80,14 +86,13 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

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

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

-	 *

 	 * @generated

 	 */

 	@Override

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

 		switch (featureID) {

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

-			return ((InternalEList<?>) getOwnedConfigurations()).basicRemove(otherEnd, msgs);

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

+				return ((InternalEList<?>)getOwnedConfigurations()).basicRemove(otherEnd, msgs);

 		}

 		return super.eInverseRemove(otherEnd, featureID, msgs);

 	}

@@ -95,14 +100,13 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

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

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

-	 *

 	 * @generated

 	 */

 	@Override

 	public Object eGet(int featureID, boolean resolve, boolean coreType) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

-			return getOwnedConfigurations();

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

+				return getOwnedConfigurations();

 		}

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

 	}

@@ -110,17 +114,16 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

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

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

-	 *

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

-			getOwnedConfigurations().clear();

-			getOwnedConfigurations().addAll((Collection<? extends ChildConfiguration>) newValue);

-			return;

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

+				getOwnedConfigurations().clear();

+				getOwnedConfigurations().addAll((Collection<? extends ChildConfiguration>)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -128,15 +131,14 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

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

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

-	 *

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

-			getOwnedConfigurations().clear();

-			return;

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

+				getOwnedConfigurations().clear();

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -144,16 +146,15 @@ public class DrawerConfigurationImpl extends ConfigurationImpl implements Drawer
 	/**

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

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

-	 *

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

 		switch (featureID) {

-		case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

-			return ownedConfigurations != null && !ownedConfigurations.isEmpty();

+			case PaletteconfigurationPackage.DRAWER_CONFIGURATION__OWNED_CONFIGURATIONS:

+				return ownedConfigurations != null && !ownedConfigurations.isEmpty();

 		}

 		return super.eIsSet(featureID);

 	}

 

-} // DrawerConfigurationImpl

+} //DrawerConfigurationImpl