[CDO] Add CDO'ified models

Fix the CDO'ified version of Architecture.genmodel

Change-Id: I0bcd300a9c5d08598da830daceed0f1ca4c9bbbe
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureContextImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureContextImpl.java
index 6d8d58e..4dbf28e 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureContextImpl.java
+++ b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureContextImpl.java
@@ -40,7 +40,6 @@
 import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain;
 import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint;
-import org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl;
 import org.eclipse.papyrus.infra.core.architecture.util.ArchitectureValidator;
 import org.eclipse.papyrus.infra.types.ElementTypeSetConfiguration;
 import org.osgi.framework.Bundle;
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureDescriptionLanguageImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureDescriptionLanguageImpl.java
index c4d7f9c..8134d49 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureDescriptionLanguageImpl.java
+++ b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureDescriptionLanguageImpl.java
@@ -16,10 +16,9 @@
 package org.eclipse.papyrus.infra.core.architecture.cdo;
 
 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.EPackage;
 import org.eclipse.emf.ecore.InternalEObject;
@@ -27,7 +26,6 @@
 import org.eclipse.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
 import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
-import org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,9 +35,9 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureDescriptionLanguageImpl#getRepresentationKinds <em>Representation Kinds</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureDescriptionLanguageImpl#getMetamodel <em>Metamodel</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureDescriptionLanguageImpl#getProfiles <em>Profiles</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureDescriptionLanguageImpl#getRepresentationKinds <em>Representation Kinds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureDescriptionLanguageImpl#getMetamodel <em>Metamodel</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureDescriptionLanguageImpl#getProfiles <em>Profiles</em>}</li>
  * </ul>
  *
  * @generated
@@ -48,6 +46,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	protected ArchitectureDescriptionLanguageImpl() {
@@ -57,6 +56,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -67,36 +67,40 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public EList<RepresentationKind> getRepresentationKinds() {
-		return (EList<RepresentationKind>)eDynamicGet(ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS, ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS, true, true);
+		return (EList<RepresentationKind>) eDynamicGet(ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS, ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public EPackage getMetamodel() {
-		return (EPackage)eDynamicGet(ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL, ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL, true, true);
+		return (EPackage) eDynamicGet(ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL, ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	public EPackage basicGetMetamodel() {
-		return (EPackage)eDynamicGet(ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL, ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL, false, true);
+		return (EPackage) eDynamicGet(ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL, ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL, false, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -107,25 +111,27 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public EList<EPackage> getProfiles() {
-		return (EList<EPackage>)eDynamicGet(ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES, ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES, true, true);
+		return (EList<EPackage>) eDynamicGet(ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES, ArchitecturePackage.Literals.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getRepresentationKinds()).basicAdd(otherEnd, msgs);
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+			return ((InternalEList<InternalEObject>) (InternalEList<?>) getRepresentationKinds()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -133,13 +139,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
-				return ((InternalEList<?>)getRepresentationKinds()).basicRemove(otherEnd, msgs);
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+			return ((InternalEList<?>) getRepresentationKinds()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -147,20 +154,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
-				return getRepresentationKinds();
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL:
-				if (resolve) {
-					return getMetamodel();
-				}
-				return basicGetMetamodel();
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES:
-				return getProfiles();
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+			return getRepresentationKinds();
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL:
+			if (resolve) {
+				return getMetamodel();
+			}
+			return basicGetMetamodel();
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES:
+			return getProfiles();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -168,23 +176,24 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
-				getRepresentationKinds().clear();
-				getRepresentationKinds().addAll((Collection<? extends RepresentationKind>)newValue);
-				return;
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL:
-				setMetamodel((EPackage)newValue);
-				return;
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES:
-				getProfiles().clear();
-				getProfiles().addAll((Collection<? extends EPackage>)newValue);
-				return;
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+			getRepresentationKinds().clear();
+			getRepresentationKinds().addAll((Collection<? extends RepresentationKind>) newValue);
+			return;
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL:
+			setMetamodel((EPackage) newValue);
+			return;
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES:
+			getProfiles().clear();
+			getProfiles().addAll((Collection<? extends EPackage>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -192,20 +201,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
-				getRepresentationKinds().clear();
-				return;
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL:
-				setMetamodel((EPackage)null);
-				return;
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES:
-				getProfiles().clear();
-				return;
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+			getRepresentationKinds().clear();
+			return;
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL:
+			setMetamodel((EPackage) null);
+			return;
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES:
+			getProfiles().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -213,19 +223,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
-				return !getRepresentationKinds().isEmpty();
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL:
-				return basicGetMetamodel() != null;
-			case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES:
-				return !getProfiles().isEmpty();
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS:
+			return !getRepresentationKinds().isEmpty();
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__METAMODEL:
+			return basicGetMetamodel() != null;
+		case ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__PROFILES:
+			return !getProfiles().isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //ArchitectureDescriptionLanguageImpl
+} // ArchitectureDescriptionLanguageImpl
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureDomainImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureDomainImpl.java
index d382779..b81ce73 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureDomainImpl.java
+++ b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureDomainImpl.java
@@ -18,9 +18,7 @@
 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.InternalEList;
@@ -29,7 +27,6 @@
 import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 import org.eclipse.papyrus.infra.core.architecture.Concern;
 import org.eclipse.papyrus.infra.core.architecture.Stakeholder;
-import org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -39,9 +36,9 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureDomainImpl#getStakeholders <em>Stakeholders</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureDomainImpl#getConcerns <em>Concerns</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureDomainImpl#getContexts <em>Contexts</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureDomainImpl#getStakeholders <em>Stakeholders</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureDomainImpl#getConcerns <em>Concerns</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureDomainImpl#getContexts <em>Contexts</em>}</li>
  * </ul>
  *
  * @generated
@@ -50,6 +47,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	protected ArchitectureDomainImpl() {
@@ -59,6 +57,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -69,51 +68,55 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public EList<Stakeholder> getStakeholders() {
-		return (EList<Stakeholder>)eDynamicGet(ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS, ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__STAKEHOLDERS, true, true);
+		return (EList<Stakeholder>) eDynamicGet(ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS, ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__STAKEHOLDERS, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public EList<Concern> getConcerns() {
-		return (EList<Concern>)eDynamicGet(ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS, ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__CONCERNS, true, true);
+		return (EList<Concern>) eDynamicGet(ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS, ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__CONCERNS, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public EList<ArchitectureContext> getContexts() {
-		return (EList<ArchitectureContext>)eDynamicGet(ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS, ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__CONTEXTS, true, true);
+		return (EList<ArchitectureContext>) eDynamicGet(ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS, ArchitecturePackage.Literals.ARCHITECTURE_DOMAIN__CONTEXTS, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getStakeholders()).basicAdd(otherEnd, msgs);
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getConcerns()).basicAdd(otherEnd, msgs);
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getContexts()).basicAdd(otherEnd, msgs);
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+			return ((InternalEList<InternalEObject>) (InternalEList<?>) getStakeholders()).basicAdd(otherEnd, msgs);
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+			return ((InternalEList<InternalEObject>) (InternalEList<?>) getConcerns()).basicAdd(otherEnd, msgs);
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+			return ((InternalEList<InternalEObject>) (InternalEList<?>) getContexts()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -121,17 +124,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
-				return ((InternalEList<?>)getStakeholders()).basicRemove(otherEnd, msgs);
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
-				return ((InternalEList<?>)getConcerns()).basicRemove(otherEnd, msgs);
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
-				return ((InternalEList<?>)getContexts()).basicRemove(otherEnd, msgs);
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+			return ((InternalEList<?>) getStakeholders()).basicRemove(otherEnd, msgs);
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+			return ((InternalEList<?>) getConcerns()).basicRemove(otherEnd, msgs);
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+			return ((InternalEList<?>) getContexts()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -139,17 +143,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
-				return getStakeholders();
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
-				return getConcerns();
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
-				return getContexts();
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+			return getStakeholders();
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+			return getConcerns();
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+			return getContexts();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -157,24 +162,25 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
-				getStakeholders().clear();
-				getStakeholders().addAll((Collection<? extends Stakeholder>)newValue);
-				return;
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
-				getConcerns().clear();
-				getConcerns().addAll((Collection<? extends Concern>)newValue);
-				return;
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
-				getContexts().clear();
-				getContexts().addAll((Collection<? extends ArchitectureContext>)newValue);
-				return;
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+			getStakeholders().clear();
+			getStakeholders().addAll((Collection<? extends Stakeholder>) newValue);
+			return;
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+			getConcerns().clear();
+			getConcerns().addAll((Collection<? extends Concern>) newValue);
+			return;
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+			getContexts().clear();
+			getContexts().addAll((Collection<? extends ArchitectureContext>) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -182,20 +188,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
-				getStakeholders().clear();
-				return;
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
-				getConcerns().clear();
-				return;
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
-				getContexts().clear();
-				return;
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+			getStakeholders().clear();
+			return;
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+			getConcerns().clear();
+			return;
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+			getContexts().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -203,19 +210,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
-				return !getStakeholders().isEmpty();
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
-				return !getConcerns().isEmpty();
-			case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
-				return !getContexts().isEmpty();
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS:
+			return !getStakeholders().isEmpty();
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS:
+			return !getConcerns().isEmpty();
+		case ArchitecturePackage.ARCHITECTURE_DOMAIN__CONTEXTS:
+			return !getContexts().isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //ArchitectureDomainImpl
+} // ArchitectureDomainImpl
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureFrameworkImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureFrameworkImpl.java
index 80bf5fe..ad74810 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureFrameworkImpl.java
+++ b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureFrameworkImpl.java
@@ -1,24 +1,23 @@
 /**
 * Copyright (c) 2017 CEA LIST.
- * 
+ *
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
  *  https://www.eclipse.org/legal/epl-2.0/
  *
  *  SPDX-License-Identifier: EPL-2.0
- *  
+ *
  *  Contributors:
  *  Maged Elaasar - Initial API and implementation
- *  
- * 
+ *
+ *
  */
 package org.eclipse.papyrus.infra.core.architecture.cdo;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.papyrus.infra.core.architecture.ArchitectureFramework;
 import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
-import org.eclipse.papyrus.infra.core.architecture.impl.ArchitectureContextImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -31,6 +30,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	protected ArchitectureFrameworkImpl() {
@@ -40,6 +40,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -47,4 +48,4 @@
 		return ArchitecturePackage.Literals.ARCHITECTURE_FRAMEWORK;
 	}
 
-} //ArchitectureFrameworkImpl
+} // ArchitectureFrameworkImpl
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureViewpointImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureViewpointImpl.java
index 78cac92..f177dde 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureViewpointImpl.java
+++ b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ArchitectureViewpointImpl.java
@@ -16,18 +16,16 @@
 package org.eclipse.papyrus.infra.core.architecture.cdo;
 
 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.papyrus.infra.core.architecture.ArchitectureContext;
 import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 import org.eclipse.papyrus.infra.core.architecture.ArchitectureViewpoint;
 import org.eclipse.papyrus.infra.core.architecture.Concern;
 import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
-import org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -37,9 +35,9 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureViewpointImpl#getConcerns <em>Concerns</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureViewpointImpl#getRepresentationKinds <em>Representation Kinds</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureViewpointImpl#getContext <em>Context</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureViewpointImpl#getConcerns <em>Concerns</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureViewpointImpl#getRepresentationKinds <em>Representation Kinds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ArchitectureViewpointImpl#getContext <em>Context</em>}</li>
  * </ul>
  *
  * @generated
@@ -48,6 +46,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	protected ArchitectureViewpointImpl() {
@@ -57,6 +56,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -67,48 +67,53 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public EList<Concern> getConcerns() {
-		return (EList<Concern>)eDynamicGet(ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS, ArchitecturePackage.Literals.ARCHITECTURE_VIEWPOINT__CONCERNS, true, true);
+		return (EList<Concern>) eDynamicGet(ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS, ArchitecturePackage.Literals.ARCHITECTURE_VIEWPOINT__CONCERNS, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public EList<RepresentationKind> getRepresentationKinds() {
-		return (EList<RepresentationKind>)eDynamicGet(ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS, ArchitecturePackage.Literals.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS, true, true);
+		return (EList<RepresentationKind>) eDynamicGet(ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS, ArchitecturePackage.Literals.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public ArchitectureContext getContext() {
-		return (ArchitectureContext)eDynamicGet(ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT, ArchitecturePackage.Literals.ARCHITECTURE_VIEWPOINT__CONTEXT, true, true);
+		return (ArchitectureContext) eDynamicGet(ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT, ArchitecturePackage.Literals.ARCHITECTURE_VIEWPOINT__CONTEXT, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetContext(ArchitectureContext newContext, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newContext, ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT, msgs);
+		msgs = eBasicSetContainer((InternalEObject) newContext, ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT, msgs);
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -119,16 +124,17 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
-				if (eInternalContainer() != null) {
-					msgs = eBasicRemoveFromContainer(msgs);
-				}
-				return basicSetContext((ArchitectureContext)otherEnd, msgs);
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+			if (eInternalContainer() != null) {
+				msgs = eBasicRemoveFromContainer(msgs);
+			}
+			return basicSetContext((ArchitectureContext) otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -136,13 +142,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
-				return basicSetContext(null, msgs);
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+			return basicSetContext(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -150,13 +157,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
-				return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS, ArchitectureContext.class, msgs);
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+			return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_CONTEXT__VIEWPOINTS, ArchitectureContext.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
@@ -164,17 +172,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS:
-				return getConcerns();
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS:
-				return getRepresentationKinds();
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
-				return getContext();
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS:
+			return getConcerns();
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS:
+			return getRepresentationKinds();
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+			return getContext();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -182,23 +191,24 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS:
-				getConcerns().clear();
-				getConcerns().addAll((Collection<? extends Concern>)newValue);
-				return;
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS:
-				getRepresentationKinds().clear();
-				getRepresentationKinds().addAll((Collection<? extends RepresentationKind>)newValue);
-				return;
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
-				setContext((ArchitectureContext)newValue);
-				return;
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS:
+			getConcerns().clear();
+			getConcerns().addAll((Collection<? extends Concern>) newValue);
+			return;
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS:
+			getRepresentationKinds().clear();
+			getRepresentationKinds().addAll((Collection<? extends RepresentationKind>) newValue);
+			return;
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+			setContext((ArchitectureContext) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -206,20 +216,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS:
-				getConcerns().clear();
-				return;
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS:
-				getRepresentationKinds().clear();
-				return;
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
-				setContext((ArchitectureContext)null);
-				return;
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS:
+			getConcerns().clear();
+			return;
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS:
+			getRepresentationKinds().clear();
+			return;
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+			setContext((ArchitectureContext) null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -227,19 +238,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS:
-				return !getConcerns().isEmpty();
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS:
-				return !getRepresentationKinds().isEmpty();
-			case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
-				return getContext() != null;
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONCERNS:
+			return !getConcerns().isEmpty();
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__REPRESENTATION_KINDS:
+			return !getRepresentationKinds().isEmpty();
+		case ArchitecturePackage.ARCHITECTURE_VIEWPOINT__CONTEXT:
+			return getContext() != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //ArchitectureViewpointImpl
+} // ArchitectureViewpointImpl
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ConcernImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ConcernImpl.java
index 4d24b15..b378b77 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ConcernImpl.java
+++ b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/ConcernImpl.java
@@ -17,12 +17,10 @@
 
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
-
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.papyrus.infra.core.architecture.ArchitectureDomain;
 import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 import org.eclipse.papyrus.infra.core.architecture.Concern;
-import org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -32,7 +30,7 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ConcernImpl#getDomain <em>Domain</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.ConcernImpl#getDomain <em>Domain</em>}</li>
  * </ul>
  *
  * @generated
@@ -41,6 +39,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	protected ConcernImpl() {
@@ -50,6 +49,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -60,26 +60,29 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public ArchitectureDomain getDomain() {
-		return (ArchitectureDomain)eDynamicGet(ArchitecturePackage.CONCERN__DOMAIN, ArchitecturePackage.Literals.CONCERN__DOMAIN, true, true);
+		return (ArchitectureDomain) eDynamicGet(ArchitecturePackage.CONCERN__DOMAIN, ArchitecturePackage.Literals.CONCERN__DOMAIN, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetDomain(ArchitectureDomain newDomain, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newDomain, ArchitecturePackage.CONCERN__DOMAIN, msgs);
+		msgs = eBasicSetContainer((InternalEObject) newDomain, ArchitecturePackage.CONCERN__DOMAIN, msgs);
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -90,16 +93,17 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ArchitecturePackage.CONCERN__DOMAIN:
-				if (eInternalContainer() != null) {
-					msgs = eBasicRemoveFromContainer(msgs);
-				}
-				return basicSetDomain((ArchitectureDomain)otherEnd, msgs);
+		case ArchitecturePackage.CONCERN__DOMAIN:
+			if (eInternalContainer() != null) {
+				msgs = eBasicRemoveFromContainer(msgs);
+			}
+			return basicSetDomain((ArchitectureDomain) otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -107,13 +111,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ArchitecturePackage.CONCERN__DOMAIN:
-				return basicSetDomain(null, msgs);
+		case ArchitecturePackage.CONCERN__DOMAIN:
+			return basicSetDomain(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -121,13 +126,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
-			case ArchitecturePackage.CONCERN__DOMAIN:
-				return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS, ArchitectureDomain.class, msgs);
+		case ArchitecturePackage.CONCERN__DOMAIN:
+			return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_DOMAIN__CONCERNS, ArchitectureDomain.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
@@ -135,13 +141,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ArchitecturePackage.CONCERN__DOMAIN:
-				return getDomain();
+		case ArchitecturePackage.CONCERN__DOMAIN:
+			return getDomain();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -149,14 +156,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ArchitecturePackage.CONCERN__DOMAIN:
-				setDomain((ArchitectureDomain)newValue);
-				return;
+		case ArchitecturePackage.CONCERN__DOMAIN:
+			setDomain((ArchitectureDomain) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -164,14 +172,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ArchitecturePackage.CONCERN__DOMAIN:
-				setDomain((ArchitectureDomain)null);
-				return;
+		case ArchitecturePackage.CONCERN__DOMAIN:
+			setDomain((ArchitectureDomain) null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -179,15 +188,16 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ArchitecturePackage.CONCERN__DOMAIN:
-				return getDomain() != null;
+		case ArchitecturePackage.CONCERN__DOMAIN:
+			return getDomain() != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //ConcernImpl
+} // ConcernImpl
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/RepresentationKindImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/RepresentationKindImpl.java
index 0cc7fb8..c333d6c 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/RepresentationKindImpl.java
+++ b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/RepresentationKindImpl.java
@@ -16,17 +16,15 @@
 package org.eclipse.papyrus.infra.core.architecture.cdo;
 
 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.papyrus.infra.core.architecture.ArchitectureDescriptionLanguage;
 import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 import org.eclipse.papyrus.infra.core.architecture.Concern;
 import org.eclipse.papyrus.infra.core.architecture.RepresentationKind;
-import org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,9 +34,9 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.RepresentationKindImpl#getLanguage <em>Language</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.RepresentationKindImpl#getConcerns <em>Concerns</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.RepresentationKindImpl#getGrayedIcon <em>Grayed Icon</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.RepresentationKindImpl#getLanguage <em>Language</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.RepresentationKindImpl#getConcerns <em>Concerns</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.RepresentationKindImpl#getGrayedIcon <em>Grayed Icon</em>}</li>
  * </ul>
  *
  * @generated
@@ -48,14 +46,17 @@
 	 * The default value of the '{@link #getGrayedIcon() <em>Grayed Icon</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @see #getGrayedIcon()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final String GRAYED_ICON_EDEFAULT = null;
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	protected RepresentationKindImpl() {
@@ -65,6 +66,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -75,27 +77,30 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public EList<Concern> getConcerns() {
-		return (EList<Concern>)eDynamicGet(ArchitecturePackage.REPRESENTATION_KIND__CONCERNS, ArchitecturePackage.Literals.REPRESENTATION_KIND__CONCERNS, true, true);
+		return (EList<Concern>) eDynamicGet(ArchitecturePackage.REPRESENTATION_KIND__CONCERNS, ArchitecturePackage.Literals.REPRESENTATION_KIND__CONCERNS, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public String getGrayedIcon() {
-		return (String)eDynamicGet(ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON, ArchitecturePackage.Literals.REPRESENTATION_KIND__GRAYED_ICON, true, true);
+		return (String) eDynamicGet(ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON, ArchitecturePackage.Literals.REPRESENTATION_KIND__GRAYED_ICON, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -106,26 +111,29 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public ArchitectureDescriptionLanguage getLanguage() {
-		return (ArchitectureDescriptionLanguage)eDynamicGet(ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE, ArchitecturePackage.Literals.REPRESENTATION_KIND__LANGUAGE, true, true);
+		return (ArchitectureDescriptionLanguage) eDynamicGet(ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE, ArchitecturePackage.Literals.REPRESENTATION_KIND__LANGUAGE, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetLanguage(ArchitectureDescriptionLanguage newLanguage, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newLanguage, ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE, msgs);
+		msgs = eBasicSetContainer((InternalEObject) newLanguage, ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE, msgs);
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -136,16 +144,17 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
-				if (eInternalContainer() != null) {
-					msgs = eBasicRemoveFromContainer(msgs);
-				}
-				return basicSetLanguage((ArchitectureDescriptionLanguage)otherEnd, msgs);
+		case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+			if (eInternalContainer() != null) {
+				msgs = eBasicRemoveFromContainer(msgs);
+			}
+			return basicSetLanguage((ArchitectureDescriptionLanguage) otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -153,13 +162,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
-				return basicSetLanguage(null, msgs);
+		case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+			return basicSetLanguage(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -167,13 +177,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
-			case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
-				return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS, ArchitectureDescriptionLanguage.class, msgs);
+		case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+			return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_DESCRIPTION_LANGUAGE__REPRESENTATION_KINDS, ArchitectureDescriptionLanguage.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
@@ -181,17 +192,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
-				return getLanguage();
-			case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
-				return getConcerns();
-			case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
-				return getGrayedIcon();
+		case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+			return getLanguage();
+		case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
+			return getConcerns();
+		case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
+			return getGrayedIcon();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -199,22 +211,23 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
-				setLanguage((ArchitectureDescriptionLanguage)newValue);
-				return;
-			case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
-				getConcerns().clear();
-				getConcerns().addAll((Collection<? extends Concern>)newValue);
-				return;
-			case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
-				setGrayedIcon((String)newValue);
-				return;
+		case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+			setLanguage((ArchitectureDescriptionLanguage) newValue);
+			return;
+		case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
+			getConcerns().clear();
+			getConcerns().addAll((Collection<? extends Concern>) newValue);
+			return;
+		case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
+			setGrayedIcon((String) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -222,20 +235,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
-				setLanguage((ArchitectureDescriptionLanguage)null);
-				return;
-			case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
-				getConcerns().clear();
-				return;
-			case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
-				setGrayedIcon(GRAYED_ICON_EDEFAULT);
-				return;
+		case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+			setLanguage((ArchitectureDescriptionLanguage) null);
+			return;
+		case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
+			getConcerns().clear();
+			return;
+		case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
+			setGrayedIcon(GRAYED_ICON_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -243,19 +257,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
-				return getLanguage() != null;
-			case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
-				return !getConcerns().isEmpty();
-			case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
-				return GRAYED_ICON_EDEFAULT == null ? getGrayedIcon() != null : !GRAYED_ICON_EDEFAULT.equals(getGrayedIcon());
+		case ArchitecturePackage.REPRESENTATION_KIND__LANGUAGE:
+			return getLanguage() != null;
+		case ArchitecturePackage.REPRESENTATION_KIND__CONCERNS:
+			return !getConcerns().isEmpty();
+		case ArchitecturePackage.REPRESENTATION_KIND__GRAYED_ICON:
+			return GRAYED_ICON_EDEFAULT == null ? getGrayedIcon() != null : !GRAYED_ICON_EDEFAULT.equals(getGrayedIcon());
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //RepresentationKindImpl
+} // RepresentationKindImpl
diff --git a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/StakeholderImpl.java b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/StakeholderImpl.java
index fc8fce1..f0de870 100644
--- a/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/StakeholderImpl.java
+++ b/cdo/bundles/org.eclipse.papyrus.infra.core.architecture.cdo/src/org/eclipse/papyrus/infra/core/architecture/cdo/StakeholderImpl.java
@@ -16,17 +16,15 @@
 package org.eclipse.papyrus.infra.core.architecture.cdo;
 
 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.papyrus.infra.core.architecture.ArchitectureDomain;
 import org.eclipse.papyrus.infra.core.architecture.ArchitecturePackage;
 import org.eclipse.papyrus.infra.core.architecture.Concern;
 import org.eclipse.papyrus.infra.core.architecture.Stakeholder;
-import org.eclipse.papyrus.infra.core.architecture.impl.ADElementImpl;
 
 /**
  * <!-- begin-user-doc -->
@@ -36,8 +34,8 @@
  * The following features are implemented:
  * </p>
  * <ul>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.StakeholderImpl#getConcerns <em>Concerns</em>}</li>
- *   <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.StakeholderImpl#getDomain <em>Domain</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.StakeholderImpl#getConcerns <em>Concerns</em>}</li>
+ * <li>{@link org.eclipse.papyrus.infra.core.architecture.cdo.StakeholderImpl#getDomain <em>Domain</em>}</li>
  * </ul>
  *
  * @generated
@@ -46,6 +44,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	protected StakeholderImpl() {
@@ -55,6 +54,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -65,37 +65,41 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public EList<Concern> getConcerns() {
-		return (EList<Concern>)eDynamicGet(ArchitecturePackage.STAKEHOLDER__CONCERNS, ArchitecturePackage.Literals.STAKEHOLDER__CONCERNS, true, true);
+		return (EList<Concern>) eDynamicGet(ArchitecturePackage.STAKEHOLDER__CONCERNS, ArchitecturePackage.Literals.STAKEHOLDER__CONCERNS, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public ArchitectureDomain getDomain() {
-		return (ArchitectureDomain)eDynamicGet(ArchitecturePackage.STAKEHOLDER__DOMAIN, ArchitecturePackage.Literals.STAKEHOLDER__DOMAIN, true, true);
+		return (ArchitectureDomain) eDynamicGet(ArchitecturePackage.STAKEHOLDER__DOMAIN, ArchitecturePackage.Literals.STAKEHOLDER__DOMAIN, true, true);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	public NotificationChain basicSetDomain(ArchitectureDomain newDomain, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newDomain, ArchitecturePackage.STAKEHOLDER__DOMAIN, msgs);
+		msgs = eBasicSetContainer((InternalEObject) newDomain, ArchitecturePackage.STAKEHOLDER__DOMAIN, msgs);
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
@@ -106,16 +110,17 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
-				if (eInternalContainer() != null) {
-					msgs = eBasicRemoveFromContainer(msgs);
-				}
-				return basicSetDomain((ArchitectureDomain)otherEnd, msgs);
+		case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+			if (eInternalContainer() != null) {
+				msgs = eBasicRemoveFromContainer(msgs);
+			}
+			return basicSetDomain((ArchitectureDomain) otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -123,13 +128,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
-				return basicSetDomain(null, msgs);
+		case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+			return basicSetDomain(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -137,13 +143,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
 		switch (eContainerFeatureID()) {
-			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
-				return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS, ArchitectureDomain.class, msgs);
+		case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+			return eInternalContainer().eInverseRemove(this, ArchitecturePackage.ARCHITECTURE_DOMAIN__STAKEHOLDERS, ArchitectureDomain.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
@@ -151,15 +158,16 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case ArchitecturePackage.STAKEHOLDER__CONCERNS:
-				return getConcerns();
-			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
-				return getDomain();
+		case ArchitecturePackage.STAKEHOLDER__CONCERNS:
+			return getConcerns();
+		case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+			return getDomain();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -167,19 +175,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case ArchitecturePackage.STAKEHOLDER__CONCERNS:
-				getConcerns().clear();
-				getConcerns().addAll((Collection<? extends Concern>)newValue);
-				return;
-			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
-				setDomain((ArchitectureDomain)newValue);
-				return;
+		case ArchitecturePackage.STAKEHOLDER__CONCERNS:
+			getConcerns().clear();
+			getConcerns().addAll((Collection<? extends Concern>) newValue);
+			return;
+		case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+			setDomain((ArchitectureDomain) newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -187,17 +196,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case ArchitecturePackage.STAKEHOLDER__CONCERNS:
-				getConcerns().clear();
-				return;
-			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
-				setDomain((ArchitectureDomain)null);
-				return;
+		case ArchitecturePackage.STAKEHOLDER__CONCERNS:
+			getConcerns().clear();
+			return;
+		case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+			setDomain((ArchitectureDomain) null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -205,17 +215,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 *
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case ArchitecturePackage.STAKEHOLDER__CONCERNS:
-				return !getConcerns().isEmpty();
-			case ArchitecturePackage.STAKEHOLDER__DOMAIN:
-				return getDomain() != null;
+		case ArchitecturePackage.STAKEHOLDER__CONCERNS:
+			return !getConcerns().isEmpty();
+		case ArchitecturePackage.STAKEHOLDER__DOMAIN:
+			return getDomain() != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
-} //StakeholderImpl
+} // StakeholderImpl