386464: [UML Compare] bad name package : org.eclipe...->org.eclipse

https://bugs.eclipse.org/bugs/show_bug.cgi?id=386464

18 files changed, 650 insertions, 1013 deletions

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/META-INF/MANIFEST.MF b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/META-INF/MANIFEST.MF
index 5325607b003..60d7153cd07 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/META-INF/MANIFEST.MF
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/META-INF/MANIFEST.MF
@@ -32,12 +32,12 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: 
- org.eclipe.papyrus.uml.compare.diff.uml_diff_extension,
- org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl,
- org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.util,
  org.eclipse.papyrus.uml.compare.diff,
  org.eclipse.papyrus.uml.compare.diff.internal.merger,
  org.eclipse.papyrus.uml.compare.diff.services,
  org.eclipse.papyrus.uml.compare.diff.services.nested,
- org.eclipse.papyrus.uml.compare.diff.services.standalone
+ org.eclipse.papyrus.uml.compare.diff.services.standalone,
+ org.eclipse.papyrus.uml.compare.diff.uml_diff_extension,
+ org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl,
+ org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.util
 
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/model/papyrus_uml_diff_extension.genmodel b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/model/papyrus_uml_diff_extension.genmodel
index 3f41a672c86..ace8fa8ded4 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/model/papyrus_uml_diff_extension.genmodel
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/model/papyrus_uml_diff_extension.genmodel
@@ -5,7 +5,7 @@
     modelName="Papyrus_uml_diff_extension" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false" publicConstructors="true" usedGenPackages="platform:/plugin/org.eclipse.emf.compare.diff/model/diff.genmodel#//diff platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.compare.match/model/match.genmodel#//match">

   <foreignModel>papyrus_uml_diff_extension.ecore</foreignModel>

-  <genPackages prefix="Uml_diff_extension" basePackage="org.eclipe.papyrus.uml.compare.diff"

+  <genPackages prefix="Uml_diff_extension" basePackage="org.eclipse.papyrus.uml.compare.diff"

       disposableProviderFactory="true" ecorePackage="papyrus_uml_diff_extension.ecore#/">

     <genClasses ecoreClass="papyrus_uml_diff_extension.ecore#//GeneralizationTargetChangedExtension"/>

     <genClasses ecoreClass="papyrus_uml_diff_extension.ecore#//GeneralizationSourceChangedExtension"/>

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/GeneralizationSourceChangedExtension.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/GeneralizationSourceChangedExtension.java
index a5c4319948f..b8147112f32 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/GeneralizationSourceChangedExtension.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/GeneralizationSourceChangedExtension.java
@@ -11,7 +11,7 @@
  * 

  * 

  */

-package org.eclipe.papyrus.uml.compare.diff.uml_diff_extension;

+package org.eclipse.papyrus.uml.compare.diff.uml_diff_extension;

 

 import org.eclipse.emf.compare.diff.metamodel.MoveModelElement;

 

@@ -19,9 +19,9 @@ import org.eclipse.emf.compare.diff.metamodel.MoveModelElement;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Generalization Source Changed Extension</b></em>'.

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

- * 

- * 

- * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage#getGeneralizationSourceChangedExtension()

+ *

+ *

+ * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage#getGeneralizationSourceChangedExtension()

  * @model

  * @generated

  */

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/GeneralizationTargetChangedExtension.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/GeneralizationTargetChangedExtension.java
index 2965827de7c..e9c67424e2c 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/GeneralizationTargetChangedExtension.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/GeneralizationTargetChangedExtension.java
@@ -11,7 +11,7 @@
  * 

  * 

  */

-package org.eclipe.papyrus.uml.compare.diff.uml_diff_extension;

+package org.eclipse.papyrus.uml.compare.diff.uml_diff_extension;

 

 import org.eclipse.emf.compare.diff.metamodel.UpdateReference;

 

@@ -19,9 +19,9 @@ import org.eclipse.emf.compare.diff.metamodel.UpdateReference;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>Generalization Target Changed Extension</b></em>'.

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

- * 

- * 

- * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage#getGeneralizationTargetChangedExtension()

+ *

+ *

+ * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage#getGeneralizationTargetChangedExtension()

  * @model

  * @generated

  */

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/UMLDiffExtension.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/UMLDiffExtension.java
index 9178c66fd75..a6c08e01802 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/UMLDiffExtension.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/UMLDiffExtension.java
@@ -11,7 +11,7 @@
  * 

  * 

  */

-package org.eclipe.papyrus.uml.compare.diff.uml_diff_extension;

+package org.eclipse.papyrus.uml.compare.diff.uml_diff_extension;

 

 import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;

 

@@ -19,9 +19,9 @@ import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
  * <!-- begin-user-doc -->

  * A representation of the model object '<em><b>UML Diff Extension</b></em>'.

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

- * 

- * 

- * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage#getUMLDiffExtension()

+ *

+ *

+ * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage#getUMLDiffExtension()

  * @model

  * @generated

  */

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/Uml_diff_extensionFactory.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/Uml_diff_extensionFactory.java
index d7ad9e7e888..31188d8a1e5 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/Uml_diff_extensionFactory.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/Uml_diff_extensionFactory.java
@@ -11,7 +11,7 @@
  * 

  * 

  */

-package org.eclipe.papyrus.uml.compare.diff.uml_diff_extension;

+package org.eclipse.papyrus.uml.compare.diff.uml_diff_extension;

 

 import org.eclipse.emf.ecore.EFactory;

 

@@ -20,26 +20,22 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

  * It provides a create method for each non-abstract class of the model.

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

- * 

- * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage

+ * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage

  * @generated

  */

 public interface Uml_diff_extensionFactory extends EFactory {

-

 	/**

 	 * The singleton instance of the factory.

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

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

-	 * 

 	 * @generated

 	 */

-	Uml_diff_extensionFactory eINSTANCE = org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionFactoryImpl.init();

+	Uml_diff_extensionFactory eINSTANCE = org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionFactoryImpl.init();

 

 	/**

 	 * Returns a new object of class '<em>Generalization Target Changed Extension</em>'.

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

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

-	 * 

 	 * @return a new object of class '<em>Generalization Target Changed Extension</em>'.

 	 * @generated

 	 */

@@ -49,7 +45,6 @@ public interface Uml_diff_extensionFactory extends EFactory {
 	 * Returns a new object of class '<em>Generalization Source Changed Extension</em>'.

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

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

-	 * 

 	 * @return a new object of class '<em>Generalization Source Changed Extension</em>'.

 	 * @generated

 	 */

@@ -59,7 +54,6 @@ public interface Uml_diff_extensionFactory extends EFactory {
 	 * Returns a new object of class '<em>UML Diff Extension</em>'.

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

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

-	 * 

 	 * @return a new object of class '<em>UML Diff Extension</em>'.

 	 * @generated

 	 */

@@ -69,7 +63,6 @@ public interface Uml_diff_extensionFactory extends EFactory {
 	 * Returns the package supported by this factory.

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

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

-	 * 

 	 * @return the package supported by this factory.

 	 * @generated

 	 */

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/Uml_diff_extensionPackage.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/Uml_diff_extensionPackage.java
index d635f2389bc..72e1eae231c 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/Uml_diff_extensionPackage.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/Uml_diff_extensionPackage.java
@@ -11,7 +11,7 @@
  * 

  * 

  */

-package org.eclipe.papyrus.uml.compare.diff.uml_diff_extension;

+package org.eclipse.papyrus.uml.compare.diff.uml_diff_extension;

 

 import org.eclipse.emf.compare.diff.metamodel.DiffPackage;

 

@@ -23,24 +23,21 @@ import org.eclipse.emf.ecore.EPackage;
  * The <b>Package</b> for the model.

  * It contains accessors for the meta objects to represent

  * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

+ *   <li>each class,</li>

+ *   <li>each feature of each class,</li>

+ *   <li>each enum,</li>

+ *   <li>and each data type</li>

  * </ul>

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

- * 

- * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionFactory

+ * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionFactory

  * @model kind="package"

  * @generated

  */

 public interface Uml_diff_extensionPackage extends EPackage {

-

 	/**

 	 * The package name.

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

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

-	 * 

 	 * @generated

 	 */

 	String eNAME = "uml_diff_extension";

@@ -49,7 +46,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The package namespace URI.

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

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

-	 * 

 	 * @generated

 	 */

 	String eNS_URI = "http://www.eclipse.org/papyrus/uml/compare/diff_ext/0.9";

@@ -58,7 +54,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The package namespace name.

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

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

-	 * 

 	 * @generated

 	 */

 	String eNS_PREFIX = "uml_diff_extension";

@@ -67,19 +62,16 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The singleton instance of the package.

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

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

-	 * 

 	 * @generated

 	 */

-	Uml_diff_extensionPackage eINSTANCE = org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl.init();

+	Uml_diff_extensionPackage eINSTANCE = org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl.init();

 

 	/**

-	 * The meta object id for the '{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.UMLDiffExtensionImpl

-	 * <em>UML Diff Extension</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.UMLDiffExtensionImpl <em>UML Diff Extension</em>}' class.

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

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

-	 * 

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.UMLDiffExtensionImpl

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl#getUMLDiffExtension()

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.UMLDiffExtensionImpl

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl#getUMLDiffExtension()

 	 * @generated

 	 */

 	int UML_DIFF_EXTENSION = 2;

@@ -88,7 +80,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Hide Elements</b></em>' reference list.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -98,7 +89,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Collapsed</b></em>' attribute.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -108,20 +98,17 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The number of structural features of the '<em>UML Diff Extension</em>' class.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

 	int UML_DIFF_EXTENSION_FEATURE_COUNT = DiffPackage.ABSTRACT_DIFF_EXTENSION_FEATURE_COUNT + 0;

 

 	/**

-	 * The meta object id for the '{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl

-	 * <em>Generalization Target Changed Extension</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl <em>Generalization Target Changed Extension</em>}' class.

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

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

-	 * 

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl#getGeneralizationTargetChangedExtension()

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl#getGeneralizationTargetChangedExtension()

 	 * @generated

 	 */

 	int GENERALIZATION_TARGET_CHANGED_EXTENSION = 0;

@@ -130,7 +117,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Hide Elements</b></em>' reference list.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -140,7 +126,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Collapsed</b></em>' attribute.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -150,7 +135,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -160,7 +144,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Hidden By</b></em>' reference list.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -170,7 +153,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Conflicting</b></em>' attribute.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -180,7 +162,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -190,7 +171,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Remote</b></em>' attribute.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -200,7 +180,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Requires</b></em>' reference list.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -210,7 +189,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Required By</b></em>' reference list.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -220,7 +198,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Reference</b></em>' reference.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -230,7 +207,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Right Element</b></em>' reference.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -240,7 +216,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Left Element</b></em>' reference.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -250,7 +225,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Left Target</b></em>' reference.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -260,7 +234,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Right Target</b></em>' reference.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -270,20 +243,17 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The number of structural features of the '<em>Generalization Target Changed Extension</em>' class.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

 	int GENERALIZATION_TARGET_CHANGED_EXTENSION_FEATURE_COUNT = UML_DIFF_EXTENSION_FEATURE_COUNT + 12;

 

 	/**

-	 * The meta object id for the '{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl

-	 * <em>Generalization Source Changed Extension</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl <em>Generalization Source Changed Extension</em>}' class.

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

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

-	 * 

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl#getGeneralizationSourceChangedExtension()

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl#getGeneralizationSourceChangedExtension()

 	 * @generated

 	 */

 	int GENERALIZATION_SOURCE_CHANGED_EXTENSION = 1;

@@ -292,7 +262,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Hide Elements</b></em>' reference list.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -302,7 +271,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Collapsed</b></em>' attribute.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -312,7 +280,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -322,7 +289,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Is Hidden By</b></em>' reference list.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -332,7 +298,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Conflicting</b></em>' attribute.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -342,7 +307,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -352,7 +316,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Remote</b></em>' attribute.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -362,7 +325,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Requires</b></em>' reference list.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -372,7 +334,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Required By</b></em>' reference list.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -382,7 +343,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Right Element</b></em>' reference.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -392,7 +352,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Left Element</b></em>' reference.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -402,7 +361,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Left Target</b></em>' reference.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -412,7 +370,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The feature id for the '<em><b>Right Target</b></em>' reference.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -422,7 +379,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * The number of structural features of the '<em>Generalization Source Changed Extension</em>' class.

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

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

-	 * 

 	 * @generated

 	 * @ordered

 	 */

@@ -430,37 +386,31 @@ public interface Uml_diff_extensionPackage extends EPackage {
 

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension

-	 * <em>Generalization Target Changed Extension</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension <em>Generalization Target Changed Extension</em>}'.

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

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

-	 * 

 	 * @return the meta object for class '<em>Generalization Target Changed Extension</em>'.

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension

 	 * @generated

 	 */

 	EClass getGeneralizationTargetChangedExtension();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension

-	 * <em>Generalization Source Changed Extension</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension <em>Generalization Source Changed Extension</em>}'.

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

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

-	 * 

 	 * @return the meta object for class '<em>Generalization Source Changed Extension</em>'.

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension

 	 * @generated

 	 */

 	EClass getGeneralizationSourceChangedExtension();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.UMLDiffExtension <em>UML Diff Extension</em>}

-	 * '.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.UMLDiffExtension <em>UML Diff Extension</em>}'.

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

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

-	 * 

 	 * @return the meta object for class '<em>UML Diff Extension</em>'.

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.UMLDiffExtension

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.UMLDiffExtension

 	 * @generated

 	 */

 	EClass getUMLDiffExtension();

@@ -469,7 +419,6 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.

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

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

-	 * 

 	 * @return the factory that creates the instances of the model.

 	 * @generated

 	 */

@@ -479,51 +428,41 @@ public interface Uml_diff_extensionPackage extends EPackage {
 	 * <!-- begin-user-doc -->

 	 * Defines literals for the meta objects that represent

 	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

+	 *   <li>each class,</li>

+	 *   <li>each feature of each class,</li>

+	 *   <li>each enum,</li>

+	 *   <li>and each data type</li>

 	 * </ul>

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

-	 * 

 	 * @generated

 	 */

 	interface Literals {

-

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl

-		 * <em>Generalization Target Changed Extension</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl <em>Generalization Target Changed Extension</em>}' class.

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

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

-		 * 

-		 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl

-		 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl#getGeneralizationTargetChangedExtension()

+		 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl

+		 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl#getGeneralizationTargetChangedExtension()

 		 * @generated

 		 */

 		EClass GENERALIZATION_TARGET_CHANGED_EXTENSION = eINSTANCE.getGeneralizationTargetChangedExtension();

 

 		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl

-		 * <em>Generalization Source Changed Extension</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl <em>Generalization Source Changed Extension</em>}' class.

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

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

-		 * 

-		 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl

-		 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl#getGeneralizationSourceChangedExtension()

+		 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl

+		 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl#getGeneralizationSourceChangedExtension()

 		 * @generated

 		 */

 		EClass GENERALIZATION_SOURCE_CHANGED_EXTENSION = eINSTANCE.getGeneralizationSourceChangedExtension();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.UMLDiffExtensionImpl

-		 * <em>UML Diff Extension</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.UMLDiffExtensionImpl <em>UML Diff Extension</em>}' class.

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

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

-		 * 

-		 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.UMLDiffExtensionImpl

-		 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl#getUMLDiffExtension()

+		 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.UMLDiffExtensionImpl

+		 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.Uml_diff_extensionPackageImpl#getUMLDiffExtension()

 		 * @generated

 		 */

 		EClass UML_DIFF_EXTENSION = eINSTANCE.getUMLDiffExtension();

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/impl/GeneralizationSourceChangedExtensionImpl.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/impl/GeneralizationSourceChangedExtensionImpl.java
index 869b580f1d5..143f1aafd7a 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/impl/GeneralizationSourceChangedExtensionImpl.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/impl/GeneralizationSourceChangedExtensionImpl.java
@@ -11,13 +11,10 @@
  * 

  * 

  */

-package org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl;

+package org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl;

 

 import java.util.Collection;

 

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension;

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage;

-

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

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

 

@@ -41,6 +38,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

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

 

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage;

+

 /**

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

  * An implementation of the model object '<em><b>Generalization Source Changed Extension</b></em>'.

@@ -48,37 +48,27 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getSubDiffElements <em>Sub Diff

- * Elements</em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getIsHiddenBy <em>Is Hidden By

- * </em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#isConflicting <em>Conflicting</em>}

- * </li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getKind <em>Kind</em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#isRemote <em>Remote</em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getRequires <em>Requires</em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getRequiredBy <em>Required By</em>}

- * </li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getRightElement <em>Right Element

- * </em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getLeftElement <em>Left Element

- * </em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getLeftTarget <em>Left Target</em>}

- * </li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getRightTarget <em>Right Target

- * </em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getSubDiffElements <em>Sub Diff Elements</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getIsHiddenBy <em>Is Hidden By</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#isConflicting <em>Conflicting</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getKind <em>Kind</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#isRemote <em>Remote</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getRequires <em>Requires</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getRequiredBy <em>Required By</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getRightElement <em>Right Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getLeftElement <em>Left Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getLeftTarget <em>Left Target</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl#getRightTarget <em>Right Target</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionImpl implements GeneralizationSourceChangedExtension {

-

 	/**

 	 * The cached value of the '{@link #getSubDiffElements() <em>Sub Diff Elements</em>}' containment reference list.

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

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

-	 * 

 	 * @see #getSubDiffElements()

 	 * @generated

 	 * @ordered

@@ -89,7 +79,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getIsHiddenBy() <em>Is Hidden By</em>}' reference list.

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

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

-	 * 

 	 * @see #getIsHiddenBy()

 	 * @generated

 	 * @ordered

@@ -100,7 +89,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The default value of the '{@link #isConflicting() <em>Conflicting</em>}' attribute.

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

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

-	 * 

 	 * @see #isConflicting()

 	 * @generated

 	 * @ordered

@@ -111,7 +99,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #isConflicting() <em>Conflicting</em>}' attribute.

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

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

-	 * 

 	 * @see #isConflicting()

 	 * @generated

 	 * @ordered

@@ -122,7 +109,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.

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

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

-	 * 

 	 * @see #getKind()

 	 * @generated

 	 * @ordered

@@ -133,7 +119,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

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

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

-	 * 

 	 * @see #getKind()

 	 * @generated

 	 * @ordered

@@ -144,7 +129,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The default value of the '{@link #isRemote() <em>Remote</em>}' attribute.

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

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

-	 * 

 	 * @see #isRemote()

 	 * @generated

 	 * @ordered

@@ -155,7 +139,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #isRemote() <em>Remote</em>}' attribute.

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

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

-	 * 

 	 * @see #isRemote()

 	 * @generated

 	 * @ordered

@@ -166,7 +149,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getRequires() <em>Requires</em>}' reference list.

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

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

-	 * 

 	 * @see #getRequires()

 	 * @generated

 	 * @ordered

@@ -177,7 +159,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getRequiredBy() <em>Required By</em>}' reference list.

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

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

-	 * 

 	 * @see #getRequiredBy()

 	 * @generated

 	 * @ordered

@@ -188,7 +169,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getRightElement() <em>Right Element</em>}' reference.

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

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

-	 * 

 	 * @see #getRightElement()

 	 * @generated

 	 * @ordered

@@ -199,7 +179,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getLeftElement() <em>Left Element</em>}' reference.

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

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

-	 * 

 	 * @see #getLeftElement()

 	 * @generated

 	 * @ordered

@@ -210,7 +189,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getLeftTarget() <em>Left Target</em>}' reference.

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

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

-	 * 

 	 * @see #getLeftTarget()

 	 * @generated

 	 * @ordered

@@ -221,7 +199,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getRightTarget() <em>Right Target</em>}' reference.

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

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

-	 * 

 	 * @see #getRightTarget()

 	 * @generated

 	 * @ordered

@@ -231,7 +208,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public GeneralizationSourceChangedExtensionImpl() {

@@ -241,7 +217,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -252,11 +227,10 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EList<DiffElement> getSubDiffElements() {

-		if(subDiffElements == null) {

+		if (subDiffElements == null) {

 			subDiffElements = new EObjectContainmentEList<DiffElement>(DiffElement.class, this, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS);

 		}

 		return subDiffElements;

@@ -265,11 +239,10 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EList<AbstractDiffExtension> getIsHiddenBy() {

-		if(isHiddenBy == null) {

+		if (isHiddenBy == null) {

 			isHiddenBy = new EObjectWithInverseResolvingEList.ManyInverse<AbstractDiffExtension>(AbstractDiffExtension.class, this, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY, DiffPackage.ABSTRACT_DIFF_EXTENSION__HIDE_ELEMENTS);

 		}

 		return isHiddenBy;

@@ -278,7 +251,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public boolean isConflicting() {

@@ -288,7 +260,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public DifferenceKind getKind() {

@@ -298,7 +269,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public boolean isRemote() {

@@ -308,24 +278,22 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public void setRemote(boolean newRemote) {

 		boolean oldRemote = remote;

 		remote = newRemote;

-		if(eNotificationRequired())

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE, oldRemote, remote));

 	}

 

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EList<DiffElement> getRequires() {

-		if(requires == null) {

+		if (requires == null) {

 			requires = new EObjectWithInverseResolvingEList.ManyInverse<DiffElement>(DiffElement.class, this, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES, DiffPackage.DIFF_ELEMENT__REQUIRED_BY);

 		}

 		return requires;

@@ -334,11 +302,10 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EList<DiffElement> getRequiredBy() {

-		if(requiredBy == null) {

+		if (requiredBy == null) {

 			requiredBy = new EObjectWithInverseResolvingEList.ManyInverse<DiffElement>(DiffElement.class, this, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY, DiffPackage.DIFF_ELEMENT__REQUIRES);

 		}

 		return requiredBy;

@@ -347,15 +314,14 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject getRightElement() {

-		if(rightElement != null && rightElement.eIsProxy()) {

+		if (rightElement != null && rightElement.eIsProxy()) {

 			InternalEObject oldRightElement = (InternalEObject)rightElement;

 			rightElement = eResolveProxy(oldRightElement);

-			if(rightElement != oldRightElement) {

-				if(eNotificationRequired())

+			if (rightElement != oldRightElement) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT, oldRightElement, rightElement));

 			}

 		}

@@ -365,7 +331,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject basicGetRightElement() {

@@ -375,28 +340,26 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public void setRightElement(EObject newRightElement) {

 		EObject oldRightElement = rightElement;

 		rightElement = newRightElement;

-		if(eNotificationRequired())

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT, oldRightElement, rightElement));

 	}

 

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject getLeftElement() {

-		if(leftElement != null && leftElement.eIsProxy()) {

+		if (leftElement != null && leftElement.eIsProxy()) {

 			InternalEObject oldLeftElement = (InternalEObject)leftElement;

 			leftElement = eResolveProxy(oldLeftElement);

-			if(leftElement != oldLeftElement) {

-				if(eNotificationRequired())

+			if (leftElement != oldLeftElement) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT, oldLeftElement, leftElement));

 			}

 		}

@@ -406,7 +369,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject basicGetLeftElement() {

@@ -416,28 +378,26 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public void setLeftElement(EObject newLeftElement) {

 		EObject oldLeftElement = leftElement;

 		leftElement = newLeftElement;

-		if(eNotificationRequired())

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT, oldLeftElement, leftElement));

 	}

 

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject getLeftTarget() {

-		if(leftTarget != null && leftTarget.eIsProxy()) {

+		if (leftTarget != null && leftTarget.eIsProxy()) {

 			InternalEObject oldLeftTarget = (InternalEObject)leftTarget;

 			leftTarget = eResolveProxy(oldLeftTarget);

-			if(leftTarget != oldLeftTarget) {

-				if(eNotificationRequired())

+			if (leftTarget != oldLeftTarget) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET, oldLeftTarget, leftTarget));

 			}

 		}

@@ -447,7 +407,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject basicGetLeftTarget() {

@@ -457,28 +416,26 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public void setLeftTarget(EObject newLeftTarget) {

 		EObject oldLeftTarget = leftTarget;

 		leftTarget = newLeftTarget;

-		if(eNotificationRequired())

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET, oldLeftTarget, leftTarget));

 	}

 

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject getRightTarget() {

-		if(rightTarget != null && rightTarget.eIsProxy()) {

+		if (rightTarget != null && rightTarget.eIsProxy()) {

 			InternalEObject oldRightTarget = (InternalEObject)rightTarget;

 			rightTarget = eResolveProxy(oldRightTarget);

-			if(rightTarget != oldRightTarget) {

-				if(eNotificationRequired())

+			if (rightTarget != oldRightTarget) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET, oldRightTarget, rightTarget));

 			}

 		}

@@ -488,7 +445,6 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject basicGetRightTarget() {

@@ -498,32 +454,30 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public void setRightTarget(EObject newRightTarget) {

 		EObject oldRightTarget = rightTarget;

 		rightTarget = newRightTarget;

-		if(eNotificationRequired())

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET, oldRightTarget, rightTarget));

 	}

 

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

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

-		switch(featureID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getIsHiddenBy()).basicAdd(otherEnd, msgs);

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getRequires()).basicAdd(otherEnd, msgs);

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getRequiredBy()).basicAdd(otherEnd, msgs);

+		switch (featureID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getIsHiddenBy()).basicAdd(otherEnd, msgs);

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getRequires()).basicAdd(otherEnd, msgs);

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getRequiredBy()).basicAdd(otherEnd, msgs);

 		}

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

 	}

@@ -531,20 +485,19 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

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

-		switch(featureID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

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

+		switch (featureID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

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

 		}

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

 	}

@@ -552,42 +505,37 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

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

-		switch(featureID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

-			return getSubDiffElements();

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

-			return getIsHiddenBy();

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__CONFLICTING:

-			return isConflicting();

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__KIND:

-			return getKind();

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE:

-			return isRemote();

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

-			return getRequires();

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

-			return getRequiredBy();

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT:

-			if(resolve)

-				return getRightElement();

-			return basicGetRightElement();

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT:

-			if(resolve)

-				return getLeftElement();

-			return basicGetLeftElement();

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET:

-			if(resolve)

-				return getLeftTarget();

-			return basicGetLeftTarget();

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET:

-			if(resolve)

-				return getRightTarget();

-			return basicGetRightTarget();

+		switch (featureID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

+				return getSubDiffElements();

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

+				return getIsHiddenBy();

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__CONFLICTING:

+				return isConflicting();

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__KIND:

+				return getKind();

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE:

+				return isRemote();

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

+				return getRequires();

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

+				return getRequiredBy();

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT:

+				if (resolve) return getRightElement();

+				return basicGetRightElement();

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT:

+				if (resolve) return getLeftElement();

+				return basicGetLeftElement();

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET:

+				if (resolve) return getLeftTarget();

+				return basicGetLeftTarget();

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET:

+				if (resolve) return getRightTarget();

+				return basicGetRightTarget();

 		}

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

 	}

@@ -595,44 +543,43 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

-			getSubDiffElements().clear();

-			getSubDiffElements().addAll((Collection<? extends DiffElement>)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

-			getIsHiddenBy().clear();

-			getIsHiddenBy().addAll((Collection<? extends AbstractDiffExtension>)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE:

-			setRemote((Boolean)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

-			getRequires().clear();

-			getRequires().addAll((Collection<? extends DiffElement>)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

-			getRequiredBy().clear();

-			getRequiredBy().addAll((Collection<? extends DiffElement>)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT:

-			setRightElement((EObject)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT:

-			setLeftElement((EObject)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET:

-			setLeftTarget((EObject)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET:

-			setRightTarget((EObject)newValue);

-			return;

+		switch (featureID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

+				getSubDiffElements().clear();

+				getSubDiffElements().addAll((Collection<? extends DiffElement>)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

+				getIsHiddenBy().clear();

+				getIsHiddenBy().addAll((Collection<? extends AbstractDiffExtension>)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE:

+				setRemote((Boolean)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

+				getRequires().clear();

+				getRequires().addAll((Collection<? extends DiffElement>)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

+				getRequiredBy().clear();

+				getRequiredBy().addAll((Collection<? extends DiffElement>)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT:

+				setRightElement((EObject)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT:

+				setLeftElement((EObject)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET:

+				setLeftTarget((EObject)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET:

+				setRightTarget((EObject)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -640,39 +587,38 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

-			getSubDiffElements().clear();

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

-			getIsHiddenBy().clear();

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE:

-			setRemote(REMOTE_EDEFAULT);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

-			getRequires().clear();

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

-			getRequiredBy().clear();

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT:

-			setRightElement((EObject)null);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT:

-			setLeftElement((EObject)null);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET:

-			setLeftTarget((EObject)null);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET:

-			setRightTarget((EObject)null);

-			return;

+		switch (featureID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

+				getSubDiffElements().clear();

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

+				getIsHiddenBy().clear();

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE:

+				setRemote(REMOTE_EDEFAULT);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

+				getRequires().clear();

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

+				getRequiredBy().clear();

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT:

+				setRightElement((EObject)null);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT:

+				setLeftElement((EObject)null);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET:

+				setLeftTarget((EObject)null);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET:

+				setRightTarget((EObject)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -680,34 +626,33 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__CONFLICTING:

-			return conflicting != CONFLICTING_EDEFAULT;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__KIND:

-			return kind != KIND_EDEFAULT;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE:

-			return remote != REMOTE_EDEFAULT;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT:

-			return rightElement != null;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT:

-			return leftElement != null;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET:

-			return leftTarget != null;

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET:

-			return rightTarget != null;

+		switch (featureID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__CONFLICTING:

+				return conflicting != CONFLICTING_EDEFAULT;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__KIND:

+				return kind != KIND_EDEFAULT;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE:

+				return remote != REMOTE_EDEFAULT;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT:

+				return rightElement != null;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT:

+				return leftElement != null;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET:

+				return leftTarget != null;

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET:

+				return rightTarget != null;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -715,55 +660,39 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if(baseClass == DiffElement.class) {

-			switch(derivedFeatureID) {

-			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

-				return DiffPackage.DIFF_ELEMENT__SUB_DIFF_ELEMENTS;

-			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY:

-				return DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY;

-			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__CONFLICTING:

-				return DiffPackage.DIFF_ELEMENT__CONFLICTING;

-			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__KIND:

-				return DiffPackage.DIFF_ELEMENT__KIND;

-			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE:

-				return DiffPackage.DIFF_ELEMENT__REMOTE;

-			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES:

-				return DiffPackage.DIFF_ELEMENT__REQUIRES;

-			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY:

-				return DiffPackage.DIFF_ELEMENT__REQUIRED_BY;

-			default:

-				return -1;

+		if (baseClass == DiffElement.class) {

+			switch (derivedFeatureID) {

+				case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS: return DiffPackage.DIFF_ELEMENT__SUB_DIFF_ELEMENTS;

+				case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY: return DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY;

+				case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__CONFLICTING: return DiffPackage.DIFF_ELEMENT__CONFLICTING;

+				case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__KIND: return DiffPackage.DIFF_ELEMENT__KIND;

+				case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE: return DiffPackage.DIFF_ELEMENT__REMOTE;

+				case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES: return DiffPackage.DIFF_ELEMENT__REQUIRES;

+				case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY: return DiffPackage.DIFF_ELEMENT__REQUIRED_BY;

+				default: return -1;

 			}

 		}

-		if(baseClass == ModelElementChange.class) {

-			switch(derivedFeatureID) {

-			default:

-				return -1;

+		if (baseClass == ModelElementChange.class) {

+			switch (derivedFeatureID) {

+				default: return -1;

 			}

 		}

-		if(baseClass == UpdateModelElement.class) {

-			switch(derivedFeatureID) {

-			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT:

-				return DiffPackage.UPDATE_MODEL_ELEMENT__RIGHT_ELEMENT;

-			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT:

-				return DiffPackage.UPDATE_MODEL_ELEMENT__LEFT_ELEMENT;

-			default:

-				return -1;

+		if (baseClass == UpdateModelElement.class) {

+			switch (derivedFeatureID) {

+				case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT: return DiffPackage.UPDATE_MODEL_ELEMENT__RIGHT_ELEMENT;

+				case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT: return DiffPackage.UPDATE_MODEL_ELEMENT__LEFT_ELEMENT;

+				default: return -1;

 			}

 		}

-		if(baseClass == MoveModelElement.class) {

-			switch(derivedFeatureID) {

-			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET:

-				return DiffPackage.MOVE_MODEL_ELEMENT__LEFT_TARGET;

-			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET:

-				return DiffPackage.MOVE_MODEL_ELEMENT__RIGHT_TARGET;

-			default:

-				return -1;

+		if (baseClass == MoveModelElement.class) {

+			switch (derivedFeatureID) {

+				case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET: return DiffPackage.MOVE_MODEL_ELEMENT__LEFT_TARGET;

+				case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET: return DiffPackage.MOVE_MODEL_ELEMENT__RIGHT_TARGET;

+				default: return -1;

 			}

 		}

 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

@@ -772,55 +701,39 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if(baseClass == DiffElement.class) {

-			switch(baseFeatureID) {

-			case DiffPackage.DIFF_ELEMENT__SUB_DIFF_ELEMENTS:

-				return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS;

-			case DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY:

-				return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY;

-			case DiffPackage.DIFF_ELEMENT__CONFLICTING:

-				return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__CONFLICTING;

-			case DiffPackage.DIFF_ELEMENT__KIND:

-				return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__KIND;

-			case DiffPackage.DIFF_ELEMENT__REMOTE:

-				return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE;

-			case DiffPackage.DIFF_ELEMENT__REQUIRES:

-				return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES;

-			case DiffPackage.DIFF_ELEMENT__REQUIRED_BY:

-				return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY;

-			default:

-				return -1;

+		if (baseClass == DiffElement.class) {

+			switch (baseFeatureID) {

+				case DiffPackage.DIFF_ELEMENT__SUB_DIFF_ELEMENTS: return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS;

+				case DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY: return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__IS_HIDDEN_BY;

+				case DiffPackage.DIFF_ELEMENT__CONFLICTING: return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__CONFLICTING;

+				case DiffPackage.DIFF_ELEMENT__KIND: return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__KIND;

+				case DiffPackage.DIFF_ELEMENT__REMOTE: return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REMOTE;

+				case DiffPackage.DIFF_ELEMENT__REQUIRES: return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRES;

+				case DiffPackage.DIFF_ELEMENT__REQUIRED_BY: return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__REQUIRED_BY;

+				default: return -1;

 			}

 		}

-		if(baseClass == ModelElementChange.class) {

-			switch(baseFeatureID) {

-			default:

-				return -1;

+		if (baseClass == ModelElementChange.class) {

+			switch (baseFeatureID) {

+				default: return -1;

 			}

 		}

-		if(baseClass == UpdateModelElement.class) {

-			switch(baseFeatureID) {

-			case DiffPackage.UPDATE_MODEL_ELEMENT__RIGHT_ELEMENT:

-				return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT;

-			case DiffPackage.UPDATE_MODEL_ELEMENT__LEFT_ELEMENT:

-				return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT;

-			default:

-				return -1;

+		if (baseClass == UpdateModelElement.class) {

+			switch (baseFeatureID) {

+				case DiffPackage.UPDATE_MODEL_ELEMENT__RIGHT_ELEMENT: return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_ELEMENT;

+				case DiffPackage.UPDATE_MODEL_ELEMENT__LEFT_ELEMENT: return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_ELEMENT;

+				default: return -1;

 			}

 		}

-		if(baseClass == MoveModelElement.class) {

-			switch(baseFeatureID) {

-			case DiffPackage.MOVE_MODEL_ELEMENT__LEFT_TARGET:

-				return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET;

-			case DiffPackage.MOVE_MODEL_ELEMENT__RIGHT_TARGET:

-				return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET;

-			default:

-				return -1;

+		if (baseClass == MoveModelElement.class) {

+			switch (baseFeatureID) {

+				case DiffPackage.MOVE_MODEL_ELEMENT__LEFT_TARGET: return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__LEFT_TARGET;

+				case DiffPackage.MOVE_MODEL_ELEMENT__RIGHT_TARGET: return Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION__RIGHT_TARGET;

+				default: return -1;

 			}

 		}

 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

@@ -829,13 +742,11 @@ public class GeneralizationSourceChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

 	 * <!-- 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(" (conflicting: ");

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/impl/GeneralizationTargetChangedExtensionImpl.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/impl/GeneralizationTargetChangedExtensionImpl.java
index 0a58d0c79c6..cf6c090c187 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/impl/GeneralizationTargetChangedExtensionImpl.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/impl/GeneralizationTargetChangedExtensionImpl.java
@@ -11,13 +11,10 @@
  * 

  * 

  */

-package org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl;

+package org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl;

 

 import java.util.Collection;

 

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension;

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage;

-

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

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

 

@@ -41,6 +38,9 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

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

 

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage;

+

 /**

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

  * An implementation of the model object '<em><b>Generalization Target Changed Extension</b></em>'.

@@ -48,38 +48,28 @@ import org.eclipse.emf.ecore.util.InternalEList;
  * <p>

  * The following features are implemented:

  * <ul>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getSubDiffElements <em>Sub Diff

- * Elements</em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getIsHiddenBy <em>Is Hidden By

- * </em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#isConflicting <em>Conflicting</em>}

- * </li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getKind <em>Kind</em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#isRemote <em>Remote</em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getRequires <em>Requires</em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getRequiredBy <em>Required By</em>}

- * </li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getReference <em>Reference</em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getRightElement <em>Right Element

- * </em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getLeftElement <em>Left Element

- * </em>}</li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getLeftTarget <em>Left Target</em>}

- * </li>

- * <li>{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getRightTarget <em>Right Target

- * </em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getSubDiffElements <em>Sub Diff Elements</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getIsHiddenBy <em>Is Hidden By</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#isConflicting <em>Conflicting</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getKind <em>Kind</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#isRemote <em>Remote</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getRequires <em>Requires</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getRequiredBy <em>Required By</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getReference <em>Reference</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getRightElement <em>Right Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getLeftElement <em>Left Element</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getLeftTarget <em>Left Target</em>}</li>

+ *   <li>{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl#getRightTarget <em>Right Target</em>}</li>

  * </ul>

  * </p>

- * 

+ *

  * @generated

  */

 public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionImpl implements GeneralizationTargetChangedExtension {

-

 	/**

 	 * The cached value of the '{@link #getSubDiffElements() <em>Sub Diff Elements</em>}' containment reference list.

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

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

-	 * 

 	 * @see #getSubDiffElements()

 	 * @generated

 	 * @ordered

@@ -90,7 +80,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getIsHiddenBy() <em>Is Hidden By</em>}' reference list.

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

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

-	 * 

 	 * @see #getIsHiddenBy()

 	 * @generated

 	 * @ordered

@@ -101,7 +90,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The default value of the '{@link #isConflicting() <em>Conflicting</em>}' attribute.

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

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

-	 * 

 	 * @see #isConflicting()

 	 * @generated

 	 * @ordered

@@ -112,7 +100,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #isConflicting() <em>Conflicting</em>}' attribute.

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

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

-	 * 

 	 * @see #isConflicting()

 	 * @generated

 	 * @ordered

@@ -123,7 +110,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.

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

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

-	 * 

 	 * @see #getKind()

 	 * @generated

 	 * @ordered

@@ -134,7 +120,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.

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

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

-	 * 

 	 * @see #getKind()

 	 * @generated

 	 * @ordered

@@ -145,7 +130,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The default value of the '{@link #isRemote() <em>Remote</em>}' attribute.

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

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

-	 * 

 	 * @see #isRemote()

 	 * @generated

 	 * @ordered

@@ -156,7 +140,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #isRemote() <em>Remote</em>}' attribute.

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

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

-	 * 

 	 * @see #isRemote()

 	 * @generated

 	 * @ordered

@@ -167,7 +150,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getRequires() <em>Requires</em>}' reference list.

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

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

-	 * 

 	 * @see #getRequires()

 	 * @generated

 	 * @ordered

@@ -178,7 +160,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getRequiredBy() <em>Required By</em>}' reference list.

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

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

-	 * 

 	 * @see #getRequiredBy()

 	 * @generated

 	 * @ordered

@@ -189,7 +170,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getReference() <em>Reference</em>}' reference.

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

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

-	 * 

 	 * @see #getReference()

 	 * @generated

 	 * @ordered

@@ -200,7 +180,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getRightElement() <em>Right Element</em>}' reference.

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

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

-	 * 

 	 * @see #getRightElement()

 	 * @generated

 	 * @ordered

@@ -211,7 +190,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getLeftElement() <em>Left Element</em>}' reference.

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

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

-	 * 

 	 * @see #getLeftElement()

 	 * @generated

 	 * @ordered

@@ -222,7 +200,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getLeftTarget() <em>Left Target</em>}' reference.

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

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

-	 * 

 	 * @see #getLeftTarget()

 	 * @generated

 	 * @ordered

@@ -233,7 +210,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	 * The cached value of the '{@link #getRightTarget() <em>Right Target</em>}' reference.

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

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

-	 * 

 	 * @see #getRightTarget()

 	 * @generated

 	 * @ordered

@@ -243,7 +219,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public GeneralizationTargetChangedExtensionImpl() {

@@ -253,7 +228,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

@@ -264,11 +238,10 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EList<DiffElement> getSubDiffElements() {

-		if(subDiffElements == null) {

+		if (subDiffElements == null) {

 			subDiffElements = new EObjectContainmentEList<DiffElement>(DiffElement.class, this, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS);

 		}

 		return subDiffElements;

@@ -277,11 +250,10 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EList<AbstractDiffExtension> getIsHiddenBy() {

-		if(isHiddenBy == null) {

+		if (isHiddenBy == null) {

 			isHiddenBy = new EObjectWithInverseResolvingEList.ManyInverse<AbstractDiffExtension>(AbstractDiffExtension.class, this, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY, DiffPackage.ABSTRACT_DIFF_EXTENSION__HIDE_ELEMENTS);

 		}

 		return isHiddenBy;

@@ -290,7 +262,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public boolean isConflicting() {

@@ -300,7 +271,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public DifferenceKind getKind() {

@@ -310,7 +280,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public boolean isRemote() {

@@ -320,24 +289,22 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public void setRemote(boolean newRemote) {

 		boolean oldRemote = remote;

 		remote = newRemote;

-		if(eNotificationRequired())

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE, oldRemote, remote));

 	}

 

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EList<DiffElement> getRequires() {

-		if(requires == null) {

+		if (requires == null) {

 			requires = new EObjectWithInverseResolvingEList.ManyInverse<DiffElement>(DiffElement.class, this, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES, DiffPackage.DIFF_ELEMENT__REQUIRED_BY);

 		}

 		return requires;

@@ -346,11 +313,10 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EList<DiffElement> getRequiredBy() {

-		if(requiredBy == null) {

+		if (requiredBy == null) {

 			requiredBy = new EObjectWithInverseResolvingEList.ManyInverse<DiffElement>(DiffElement.class, this, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY, DiffPackage.DIFF_ELEMENT__REQUIRES);

 		}

 		return requiredBy;

@@ -359,15 +325,14 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EReference getReference() {

-		if(reference != null && reference.eIsProxy()) {

+		if (reference != null && reference.eIsProxy()) {

 			InternalEObject oldReference = (InternalEObject)reference;

 			reference = (EReference)eResolveProxy(oldReference);

-			if(reference != oldReference) {

-				if(eNotificationRequired())

+			if (reference != oldReference) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE, oldReference, reference));

 			}

 		}

@@ -377,7 +342,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EReference basicGetReference() {

@@ -387,28 +351,26 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public void setReference(EReference newReference) {

 		EReference oldReference = reference;

 		reference = newReference;

-		if(eNotificationRequired())

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE, oldReference, reference));

 	}

 

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject getRightElement() {

-		if(rightElement != null && rightElement.eIsProxy()) {

+		if (rightElement != null && rightElement.eIsProxy()) {

 			InternalEObject oldRightElement = (InternalEObject)rightElement;

 			rightElement = eResolveProxy(oldRightElement);

-			if(rightElement != oldRightElement) {

-				if(eNotificationRequired())

+			if (rightElement != oldRightElement) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT, oldRightElement, rightElement));

 			}

 		}

@@ -418,7 +380,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject basicGetRightElement() {

@@ -428,28 +389,26 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public void setRightElement(EObject newRightElement) {

 		EObject oldRightElement = rightElement;

 		rightElement = newRightElement;

-		if(eNotificationRequired())

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT, oldRightElement, rightElement));

 	}

 

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject getLeftElement() {

-		if(leftElement != null && leftElement.eIsProxy()) {

+		if (leftElement != null && leftElement.eIsProxy()) {

 			InternalEObject oldLeftElement = (InternalEObject)leftElement;

 			leftElement = eResolveProxy(oldLeftElement);

-			if(leftElement != oldLeftElement) {

-				if(eNotificationRequired())

+			if (leftElement != oldLeftElement) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT, oldLeftElement, leftElement));

 			}

 		}

@@ -459,7 +418,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject basicGetLeftElement() {

@@ -469,28 +427,26 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public void setLeftElement(EObject newLeftElement) {

 		EObject oldLeftElement = leftElement;

 		leftElement = newLeftElement;

-		if(eNotificationRequired())

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT, oldLeftElement, leftElement));

 	}

 

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject getLeftTarget() {

-		if(leftTarget != null && leftTarget.eIsProxy()) {

+		if (leftTarget != null && leftTarget.eIsProxy()) {

 			InternalEObject oldLeftTarget = (InternalEObject)leftTarget;

 			leftTarget = eResolveProxy(oldLeftTarget);

-			if(leftTarget != oldLeftTarget) {

-				if(eNotificationRequired())

+			if (leftTarget != oldLeftTarget) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET, oldLeftTarget, leftTarget));

 			}

 		}

@@ -500,7 +456,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject basicGetLeftTarget() {

@@ -510,28 +465,26 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public void setLeftTarget(EObject newLeftTarget) {

 		EObject oldLeftTarget = leftTarget;

 		leftTarget = newLeftTarget;

-		if(eNotificationRequired())

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET, oldLeftTarget, leftTarget));

 	}

 

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject getRightTarget() {

-		if(rightTarget != null && rightTarget.eIsProxy()) {

+		if (rightTarget != null && rightTarget.eIsProxy()) {

 			InternalEObject oldRightTarget = (InternalEObject)rightTarget;

 			rightTarget = eResolveProxy(oldRightTarget);

-			if(rightTarget != oldRightTarget) {

-				if(eNotificationRequired())

+			if (rightTarget != oldRightTarget) {

+				if (eNotificationRequired())

 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET, oldRightTarget, rightTarget));

 			}

 		}

@@ -541,7 +494,6 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EObject basicGetRightTarget() {

@@ -551,32 +503,30 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public void setRightTarget(EObject newRightTarget) {

 		EObject oldRightTarget = rightTarget;

 		rightTarget = newRightTarget;

-		if(eNotificationRequired())

+		if (eNotificationRequired())

 			eNotify(new ENotificationImpl(this, Notification.SET, Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET, oldRightTarget, rightTarget));

 	}

 

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

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

-		switch(featureID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getIsHiddenBy()).basicAdd(otherEnd, msgs);

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getRequires()).basicAdd(otherEnd, msgs);

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

-			return ((InternalEList<InternalEObject>)(InternalEList<?>)getRequiredBy()).basicAdd(otherEnd, msgs);

+		switch (featureID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getIsHiddenBy()).basicAdd(otherEnd, msgs);

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getRequires()).basicAdd(otherEnd, msgs);

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getRequiredBy()).basicAdd(otherEnd, msgs);

 		}

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

 	}

@@ -584,20 +534,19 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

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

-		switch(featureID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

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

+		switch (featureID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

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

 		}

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

 	}

@@ -605,46 +554,40 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

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

-		switch(featureID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

-			return getSubDiffElements();

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

-			return getIsHiddenBy();

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__CONFLICTING:

-			return isConflicting();

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__KIND:

-			return getKind();

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE:

-			return isRemote();

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

-			return getRequires();

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

-			return getRequiredBy();

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE:

-			if(resolve)

-				return getReference();

-			return basicGetReference();

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT:

-			if(resolve)

-				return getRightElement();

-			return basicGetRightElement();

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT:

-			if(resolve)

-				return getLeftElement();

-			return basicGetLeftElement();

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET:

-			if(resolve)

-				return getLeftTarget();

-			return basicGetLeftTarget();

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET:

-			if(resolve)

-				return getRightTarget();

-			return basicGetRightTarget();

+		switch (featureID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

+				return getSubDiffElements();

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

+				return getIsHiddenBy();

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__CONFLICTING:

+				return isConflicting();

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__KIND:

+				return getKind();

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE:

+				return isRemote();

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

+				return getRequires();

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

+				return getRequiredBy();

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE:

+				if (resolve) return getReference();

+				return basicGetReference();

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT:

+				if (resolve) return getRightElement();

+				return basicGetRightElement();

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT:

+				if (resolve) return getLeftElement();

+				return basicGetLeftElement();

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET:

+				if (resolve) return getLeftTarget();

+				return basicGetLeftTarget();

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET:

+				if (resolve) return getRightTarget();

+				return basicGetRightTarget();

 		}

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

 	}

@@ -652,47 +595,46 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@SuppressWarnings("unchecked")

 	@Override

 	public void eSet(int featureID, Object newValue) {

-		switch(featureID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

-			getSubDiffElements().clear();

-			getSubDiffElements().addAll((Collection<? extends DiffElement>)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

-			getIsHiddenBy().clear();

-			getIsHiddenBy().addAll((Collection<? extends AbstractDiffExtension>)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE:

-			setRemote((Boolean)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

-			getRequires().clear();

-			getRequires().addAll((Collection<? extends DiffElement>)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

-			getRequiredBy().clear();

-			getRequiredBy().addAll((Collection<? extends DiffElement>)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE:

-			setReference((EReference)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT:

-			setRightElement((EObject)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT:

-			setLeftElement((EObject)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET:

-			setLeftTarget((EObject)newValue);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET:

-			setRightTarget((EObject)newValue);

-			return;

+		switch (featureID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

+				getSubDiffElements().clear();

+				getSubDiffElements().addAll((Collection<? extends DiffElement>)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

+				getIsHiddenBy().clear();

+				getIsHiddenBy().addAll((Collection<? extends AbstractDiffExtension>)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE:

+				setRemote((Boolean)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

+				getRequires().clear();

+				getRequires().addAll((Collection<? extends DiffElement>)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

+				getRequiredBy().clear();

+				getRequiredBy().addAll((Collection<? extends DiffElement>)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE:

+				setReference((EReference)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT:

+				setRightElement((EObject)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT:

+				setLeftElement((EObject)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET:

+				setLeftTarget((EObject)newValue);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET:

+				setRightTarget((EObject)newValue);

+				return;

 		}

 		super.eSet(featureID, newValue);

 	}

@@ -700,42 +642,41 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public void eUnset(int featureID) {

-		switch(featureID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

-			getSubDiffElements().clear();

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

-			getIsHiddenBy().clear();

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE:

-			setRemote(REMOTE_EDEFAULT);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

-			getRequires().clear();

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

-			getRequiredBy().clear();

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE:

-			setReference((EReference)null);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT:

-			setRightElement((EObject)null);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT:

-			setLeftElement((EObject)null);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET:

-			setLeftTarget((EObject)null);

-			return;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET:

-			setRightTarget((EObject)null);

-			return;

+		switch (featureID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

+				getSubDiffElements().clear();

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

+				getIsHiddenBy().clear();

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE:

+				setRemote(REMOTE_EDEFAULT);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

+				getRequires().clear();

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

+				getRequiredBy().clear();

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE:

+				setReference((EReference)null);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT:

+				setRightElement((EObject)null);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT:

+				setLeftElement((EObject)null);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET:

+				setLeftTarget((EObject)null);

+				return;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET:

+				setRightTarget((EObject)null);

+				return;

 		}

 		super.eUnset(featureID);

 	}

@@ -743,36 +684,35 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public boolean eIsSet(int featureID) {

-		switch(featureID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__CONFLICTING:

-			return conflicting != CONFLICTING_EDEFAULT;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__KIND:

-			return kind != KIND_EDEFAULT;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE:

-			return remote != REMOTE_EDEFAULT;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

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

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE:

-			return reference != null;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT:

-			return rightElement != null;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT:

-			return leftElement != null;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET:

-			return leftTarget != null;

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET:

-			return rightTarget != null;

+		switch (featureID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__CONFLICTING:

+				return conflicting != CONFLICTING_EDEFAULT;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__KIND:

+				return kind != KIND_EDEFAULT;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE:

+				return remote != REMOTE_EDEFAULT;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

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

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE:

+				return reference != null;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT:

+				return rightElement != null;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT:

+				return leftElement != null;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET:

+				return leftTarget != null;

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET:

+				return rightTarget != null;

 		}

 		return super.eIsSet(featureID);

 	}

@@ -780,51 +720,35 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {

-		if(baseClass == DiffElement.class) {

-			switch(derivedFeatureID) {

-			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS:

-				return DiffPackage.DIFF_ELEMENT__SUB_DIFF_ELEMENTS;

-			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY:

-				return DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY;

-			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__CONFLICTING:

-				return DiffPackage.DIFF_ELEMENT__CONFLICTING;

-			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__KIND:

-				return DiffPackage.DIFF_ELEMENT__KIND;

-			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE:

-				return DiffPackage.DIFF_ELEMENT__REMOTE;

-			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES:

-				return DiffPackage.DIFF_ELEMENT__REQUIRES;

-			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY:

-				return DiffPackage.DIFF_ELEMENT__REQUIRED_BY;

-			default:

-				return -1;

+		if (baseClass == DiffElement.class) {

+			switch (derivedFeatureID) {

+				case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS: return DiffPackage.DIFF_ELEMENT__SUB_DIFF_ELEMENTS;

+				case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY: return DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY;

+				case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__CONFLICTING: return DiffPackage.DIFF_ELEMENT__CONFLICTING;

+				case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__KIND: return DiffPackage.DIFF_ELEMENT__KIND;

+				case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE: return DiffPackage.DIFF_ELEMENT__REMOTE;

+				case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES: return DiffPackage.DIFF_ELEMENT__REQUIRES;

+				case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY: return DiffPackage.DIFF_ELEMENT__REQUIRED_BY;

+				default: return -1;

 			}

 		}

-		if(baseClass == ReferenceChange.class) {

-			switch(derivedFeatureID) {

-			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE:

-				return DiffPackage.REFERENCE_CHANGE__REFERENCE;

-			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT:

-				return DiffPackage.REFERENCE_CHANGE__RIGHT_ELEMENT;

-			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT:

-				return DiffPackage.REFERENCE_CHANGE__LEFT_ELEMENT;

-			default:

-				return -1;

+		if (baseClass == ReferenceChange.class) {

+			switch (derivedFeatureID) {

+				case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE: return DiffPackage.REFERENCE_CHANGE__REFERENCE;

+				case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT: return DiffPackage.REFERENCE_CHANGE__RIGHT_ELEMENT;

+				case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT: return DiffPackage.REFERENCE_CHANGE__LEFT_ELEMENT;

+				default: return -1;

 			}

 		}

-		if(baseClass == UpdateReference.class) {

-			switch(derivedFeatureID) {

-			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET:

-				return DiffPackage.UPDATE_REFERENCE__LEFT_TARGET;

-			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET:

-				return DiffPackage.UPDATE_REFERENCE__RIGHT_TARGET;

-			default:

-				return -1;

+		if (baseClass == UpdateReference.class) {

+			switch (derivedFeatureID) {

+				case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET: return DiffPackage.UPDATE_REFERENCE__LEFT_TARGET;

+				case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET: return DiffPackage.UPDATE_REFERENCE__RIGHT_TARGET;

+				default: return -1;

 			}

 		}

 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);

@@ -833,51 +757,35 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {

-		if(baseClass == DiffElement.class) {

-			switch(baseFeatureID) {

-			case DiffPackage.DIFF_ELEMENT__SUB_DIFF_ELEMENTS:

-				return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS;

-			case DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY:

-				return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY;

-			case DiffPackage.DIFF_ELEMENT__CONFLICTING:

-				return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__CONFLICTING;

-			case DiffPackage.DIFF_ELEMENT__KIND:

-				return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__KIND;

-			case DiffPackage.DIFF_ELEMENT__REMOTE:

-				return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE;

-			case DiffPackage.DIFF_ELEMENT__REQUIRES:

-				return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES;

-			case DiffPackage.DIFF_ELEMENT__REQUIRED_BY:

-				return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY;

-			default:

-				return -1;

+		if (baseClass == DiffElement.class) {

+			switch (baseFeatureID) {

+				case DiffPackage.DIFF_ELEMENT__SUB_DIFF_ELEMENTS: return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__SUB_DIFF_ELEMENTS;

+				case DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY: return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__IS_HIDDEN_BY;

+				case DiffPackage.DIFF_ELEMENT__CONFLICTING: return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__CONFLICTING;

+				case DiffPackage.DIFF_ELEMENT__KIND: return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__KIND;

+				case DiffPackage.DIFF_ELEMENT__REMOTE: return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REMOTE;

+				case DiffPackage.DIFF_ELEMENT__REQUIRES: return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRES;

+				case DiffPackage.DIFF_ELEMENT__REQUIRED_BY: return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REQUIRED_BY;

+				default: return -1;

 			}

 		}

-		if(baseClass == ReferenceChange.class) {

-			switch(baseFeatureID) {

-			case DiffPackage.REFERENCE_CHANGE__REFERENCE:

-				return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE;

-			case DiffPackage.REFERENCE_CHANGE__RIGHT_ELEMENT:

-				return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT;

-			case DiffPackage.REFERENCE_CHANGE__LEFT_ELEMENT:

-				return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT;

-			default:

-				return -1;

+		if (baseClass == ReferenceChange.class) {

+			switch (baseFeatureID) {

+				case DiffPackage.REFERENCE_CHANGE__REFERENCE: return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__REFERENCE;

+				case DiffPackage.REFERENCE_CHANGE__RIGHT_ELEMENT: return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_ELEMENT;

+				case DiffPackage.REFERENCE_CHANGE__LEFT_ELEMENT: return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_ELEMENT;

+				default: return -1;

 			}

 		}

-		if(baseClass == UpdateReference.class) {

-			switch(baseFeatureID) {

-			case DiffPackage.UPDATE_REFERENCE__LEFT_TARGET:

-				return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET;

-			case DiffPackage.UPDATE_REFERENCE__RIGHT_TARGET:

-				return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET;

-			default:

-				return -1;

+		if (baseClass == UpdateReference.class) {

+			switch (baseFeatureID) {

+				case DiffPackage.UPDATE_REFERENCE__LEFT_TARGET: return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__LEFT_TARGET;

+				case DiffPackage.UPDATE_REFERENCE__RIGHT_TARGET: return Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION__RIGHT_TARGET;

+				default: return -1;

 			}

 		}

 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);

@@ -886,13 +794,11 @@ public class GeneralizationTargetChangedExtensionImpl extends UMLDiffExtensionIm
 	/**

 	 * <!-- 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(" (conflicting: ");

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/impl/UMLDiffExtensionImpl.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/impl/UMLDiffExtensionImpl.java
index 21707ac00bf..9e169a72a5d 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/impl/UMLDiffExtensionImpl.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/impl/UMLDiffExtensionImpl.java
@@ -11,30 +11,28 @@
  * 

  * 

  */

-package org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl;

-

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.UMLDiffExtension;

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage;

+package org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl;

 

 import org.eclipse.emf.compare.diff.metamodel.impl.AbstractDiffExtensionImpl;

 

 import org.eclipse.emf.ecore.EClass;

 

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.UMLDiffExtension;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage;

+

 /**

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

  * An implementation of the model object '<em><b>UML Diff Extension</b></em>'.

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

  * <p>

  * </p>

- * 

+ *

  * @generated

  */

 public class UMLDiffExtensionImpl extends AbstractDiffExtensionImpl implements UMLDiffExtension {

-

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public UMLDiffExtensionImpl() {

@@ -44,7 +42,6 @@ public class UMLDiffExtensionImpl extends AbstractDiffExtensionImpl implements U
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/impl/Uml_diff_extensionFactoryImpl.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/impl/Uml_diff_extensionFactoryImpl.java
index bfd836857d6..bbe1d4e770f 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/impl/Uml_diff_extensionFactoryImpl.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/impl/Uml_diff_extensionFactoryImpl.java
@@ -11,9 +11,7 @@
  * 

  * 

  */

-package org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl;

-

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.*;

+package org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

@@ -23,29 +21,29 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

 

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.*;

+

 /**

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

  * An implementation of the model <b>Factory</b>.

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

- * 

  * @generated

  */

 public class Uml_diff_extensionFactoryImpl extends EFactoryImpl implements Uml_diff_extensionFactory {

-

 	/**

 	 * Creates the default factory implementation.

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

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

-	 * 

 	 * @generated

 	 */

 	public static Uml_diff_extensionFactory init() {

 		try {

-			Uml_diff_extensionFactory theUml_diff_extensionFactory = (Uml_diff_extensionFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/uml/compare/diff_ext/0.9");

-			if(theUml_diff_extensionFactory != null) {

+			Uml_diff_extensionFactory theUml_diff_extensionFactory = (Uml_diff_extensionFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/uml/compare/diff_ext/0.9"); 

+			if (theUml_diff_extensionFactory != null) {

 				return theUml_diff_extensionFactory;

 			}

-		} catch (Exception exception) {

+		}

+		catch (Exception exception) {

 			EcorePlugin.INSTANCE.log(exception);

 		}

 		return new Uml_diff_extensionFactoryImpl();

@@ -55,7 +53,6 @@ public class Uml_diff_extensionFactoryImpl extends EFactoryImpl implements Uml_d
 	 * Creates an instance of the factory.

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

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

-	 * 

 	 * @generated

 	 */

 	public Uml_diff_extensionFactoryImpl() {

@@ -65,27 +62,22 @@ public class Uml_diff_extensionFactoryImpl extends EFactoryImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	@Override

 	public EObject create(EClass eClass) {

-		switch(eClass.getClassifierID()) {

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION:

-			return createGeneralizationTargetChangedExtension();

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION:

-			return createGeneralizationSourceChangedExtension();

-		case Uml_diff_extensionPackage.UML_DIFF_EXTENSION:

-			return createUMLDiffExtension();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

+		switch (eClass.getClassifierID()) {

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION: return createGeneralizationTargetChangedExtension();

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION: return createGeneralizationSourceChangedExtension();

+			case Uml_diff_extensionPackage.UML_DIFF_EXTENSION: return createUMLDiffExtension();

+			default:

+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

 		}

 	}

 

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public GeneralizationTargetChangedExtension createGeneralizationTargetChangedExtension() {

@@ -96,7 +88,6 @@ public class Uml_diff_extensionFactoryImpl extends EFactoryImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public GeneralizationSourceChangedExtension createGeneralizationSourceChangedExtension() {

@@ -107,7 +98,6 @@ public class Uml_diff_extensionFactoryImpl extends EFactoryImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public UMLDiffExtension createUMLDiffExtension() {

@@ -118,7 +108,6 @@ public class Uml_diff_extensionFactoryImpl extends EFactoryImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public Uml_diff_extensionPackage getUml_diff_extensionPackage() {

@@ -128,7 +117,6 @@ public class Uml_diff_extensionFactoryImpl extends EFactoryImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @deprecated

 	 * @generated

 	 */

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/impl/Uml_diff_extensionPackageImpl.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/impl/Uml_diff_extensionPackageImpl.java
index 8d84be85ad9..df1447027ae 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/impl/Uml_diff_extensionPackageImpl.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/impl/Uml_diff_extensionPackageImpl.java
@@ -11,13 +11,7 @@
  * 

  * 

  */

-package org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl;

-

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension;

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension;

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.UMLDiffExtension;

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionFactory;

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage;

+package org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl;

 

 import org.eclipse.emf.compare.diff.metamodel.DiffPackage;

 

@@ -26,19 +20,22 @@ import org.eclipse.emf.ecore.EPackage;
 

 import org.eclipse.emf.ecore.impl.EPackageImpl;

 

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.UMLDiffExtension;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionFactory;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage;

+

 /**

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

  * An implementation of the model <b>Package</b>.

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

- * 

  * @generated

  */

 public class Uml_diff_extensionPackageImpl extends EPackageImpl implements Uml_diff_extensionPackage {

-

 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	private EClass generalizationTargetChangedExtensionEClass = null;

@@ -46,7 +43,6 @@ public class Uml_diff_extensionPackageImpl extends EPackageImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	private EClass generalizationSourceChangedExtensionEClass = null;

@@ -54,21 +50,22 @@ public class Uml_diff_extensionPackageImpl extends EPackageImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	private EClass umlDiffExtensionEClass = null;

 

 	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the

-	 * package

+	 * Creates an instance of the model <b>Package</b>, registered with

+	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package

 	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the

-	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * <p>Note: the correct way to create the package is via the static

+	 * factory method {@link #init init()}, which also performs

+	 * initialization of the package, or returns the registered package,

+	 * if one already exists.

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

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

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage#eNS_URI

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage#eNS_URI

 	 * @see #init()

 	 * @generated

 	 */

@@ -79,7 +76,6 @@ public class Uml_diff_extensionPackageImpl extends EPackageImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	private static boolean isInited = false;

@@ -87,18 +83,17 @@ public class Uml_diff_extensionPackageImpl extends EPackageImpl implements Uml_d
 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

 	 * 

-	 * <p>

-	 * This method is used to initialize {@link Uml_diff_extensionPackage#eINSTANCE} when that field is accessed. Clients should not invoke it

-	 * directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->

-	 * 

+	 * <p>This method is used to initialize {@link Uml_diff_extensionPackage#eINSTANCE} when that field is accessed.

+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

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

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

 	 * @see #eNS_URI

 	 * @see #createPackageContents()

 	 * @see #initializePackageContents()

 	 * @generated

 	 */

 	public static Uml_diff_extensionPackage init() {

-		if(isInited)

-			return (Uml_diff_extensionPackage)EPackage.Registry.INSTANCE.getEPackage(Uml_diff_extensionPackage.eNS_URI);

+		if (isInited) return (Uml_diff_extensionPackage)EPackage.Registry.INSTANCE.getEPackage(Uml_diff_extensionPackage.eNS_URI);

 

 		// Obtain or create and register package

 		Uml_diff_extensionPackageImpl theUml_diff_extensionPackage = (Uml_diff_extensionPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof Uml_diff_extensionPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new Uml_diff_extensionPackageImpl());

@@ -117,7 +112,7 @@ public class Uml_diff_extensionPackageImpl extends EPackageImpl implements Uml_d
 		// Mark meta-data to indicate it can't be changed

 		theUml_diff_extensionPackage.freeze();

 

-

+  

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(Uml_diff_extensionPackage.eNS_URI, theUml_diff_extensionPackage);

 		return theUml_diff_extensionPackage;

@@ -126,7 +121,6 @@ public class Uml_diff_extensionPackageImpl extends EPackageImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EClass getGeneralizationTargetChangedExtension() {

@@ -136,7 +130,6 @@ public class Uml_diff_extensionPackageImpl extends EPackageImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EClass getGeneralizationSourceChangedExtension() {

@@ -146,7 +139,6 @@ public class Uml_diff_extensionPackageImpl extends EPackageImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public EClass getUMLDiffExtension() {

@@ -156,7 +148,6 @@ public class Uml_diff_extensionPackageImpl extends EPackageImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	public Uml_diff_extensionFactory getUml_diff_extensionFactory() {

@@ -166,22 +157,19 @@ public class Uml_diff_extensionPackageImpl extends EPackageImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	private boolean isCreated = false;

 

 	/**

-	 * Creates the meta-model objects for the package. This method is

+	 * Creates the meta-model objects for the package.  This method is

 	 * guarded to have no affect on any invocation but its first.

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

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

-	 * 

 	 * @generated

 	 */

 	public void createPackageContents() {

-		if(isCreated)

-			return;

+		if (isCreated) return;

 		isCreated = true;

 

 		// Create classes and their features

@@ -195,22 +183,19 @@ public class Uml_diff_extensionPackageImpl extends EPackageImpl implements Uml_d
 	/**

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

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

-	 * 

 	 * @generated

 	 */

 	private boolean isInitialized = false;

 

 	/**

-	 * Complete the initialization of the package and its meta-model. This

+	 * Complete the initialization of the package and its meta-model.  This

 	 * method is guarded to have no affect on any invocation but its first.

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

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

-	 * 

 	 * @generated

 	 */

 	public void initializePackageContents() {

-		if(isInitialized)

-			return;

+		if (isInitialized) return;

 		isInitialized = true;

 

 		// Initialize package

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/util/Uml_diff_extensionAdapterFactory.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/util/Uml_diff_extensionAdapterFactory.java
index 00ab3920f12..a50c58f305d 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/util/Uml_diff_extensionAdapterFactory.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/util/Uml_diff_extensionAdapterFactory.java
@@ -11,9 +11,7 @@
  * 

  * 

  */

-package org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.util;

-

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.*;

+package org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.util;

 

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

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

@@ -30,22 +28,21 @@ import org.eclipse.emf.compare.diff.metamodel.UpdateReference;
 

 import org.eclipse.emf.ecore.EObject;

 

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.*;

+

 /**

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

  * The <b>Adapter Factory</b> for the model.

  * It provides an adapter <code>createXXX</code> method for each class of the model.

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

- * 

- * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage

+ * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage

  * @generated

  */

 public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {

-

 	/**

 	 * The cached model package.

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

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

-	 * 

 	 * @generated

 	 */

 	protected static Uml_diff_extensionPackage modelPackage;

@@ -54,11 +51,10 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.

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

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

-	 * 

 	 * @generated

 	 */

 	public Uml_diff_extensionAdapterFactory() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = Uml_diff_extensionPackage.eINSTANCE;

 		}

 	}

@@ -68,16 +64,15 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.

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

-	 * 

 	 * @return whether this factory is applicable for the type of the object.

 	 * @generated

 	 */

 	@Override

 	public boolean isFactoryForType(Object object) {

-		if(object == modelPackage) {

+		if (object == modelPackage) {

 			return true;

 		}

-		if(object instanceof EObject) {

+		if (object instanceof EObject) {

 			return ((EObject)object).eClass().getEPackage() == modelPackage;

 		}

 		return false;

@@ -87,74 +82,61 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.

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

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

-	 * 

 	 * @generated

 	 */

-	protected Uml_diff_extensionSwitch<Adapter> modelSwitch = new Uml_diff_extensionSwitch<Adapter>() {

-

-		@Override

-		public Adapter caseGeneralizationTargetChangedExtension(GeneralizationTargetChangedExtension object) {

-			return createGeneralizationTargetChangedExtensionAdapter();

-		}

-

-		@Override

-		public Adapter caseGeneralizationSourceChangedExtension(GeneralizationSourceChangedExtension object) {

-			return createGeneralizationSourceChangedExtensionAdapter();

-		}

-

-		@Override

-		public Adapter caseUMLDiffExtension(UMLDiffExtension object) {

-			return createUMLDiffExtensionAdapter();

-		}

-

-		@Override

-		public Adapter caseAbstractDiffExtension(AbstractDiffExtension object) {

-			return createAbstractDiffExtensionAdapter();

-		}

-

-		@Override

-		public Adapter caseDiffElement(DiffElement object) {

-			return createDiffElementAdapter();

-		}

-

-		@Override

-		public Adapter caseReferenceChange(ReferenceChange object) {

-			return createReferenceChangeAdapter();

-		}

-

-		@Override

-		public Adapter caseUpdateReference(UpdateReference object) {

-			return createUpdateReferenceAdapter();

-		}

-

-		@Override

-		public Adapter caseModelElementChange(ModelElementChange object) {

-			return createModelElementChangeAdapter();

-		}

-

-		@Override

-		public Adapter caseUpdateModelElement(UpdateModelElement object) {

-			return createUpdateModelElementAdapter();

-		}

-

-		@Override

-		public Adapter caseMoveModelElement(MoveModelElement object) {

-			return createMoveModelElementAdapter();

-		}

-

-		@Override

-		public Adapter defaultCase(EObject object) {

-			return createEObjectAdapter();

-		}

-	};

+	protected Uml_diff_extensionSwitch<Adapter> modelSwitch =

+		new Uml_diff_extensionSwitch<Adapter>() {

+			@Override

+			public Adapter caseGeneralizationTargetChangedExtension(GeneralizationTargetChangedExtension object) {

+				return createGeneralizationTargetChangedExtensionAdapter();

+			}

+			@Override

+			public Adapter caseGeneralizationSourceChangedExtension(GeneralizationSourceChangedExtension object) {

+				return createGeneralizationSourceChangedExtensionAdapter();

+			}

+			@Override

+			public Adapter caseUMLDiffExtension(UMLDiffExtension object) {

+				return createUMLDiffExtensionAdapter();

+			}

+			@Override

+			public Adapter caseAbstractDiffExtension(AbstractDiffExtension object) {

+				return createAbstractDiffExtensionAdapter();

+			}

+			@Override

+			public Adapter caseDiffElement(DiffElement object) {

+				return createDiffElementAdapter();

+			}

+			@Override

+			public Adapter caseReferenceChange(ReferenceChange object) {

+				return createReferenceChangeAdapter();

+			}

+			@Override

+			public Adapter caseUpdateReference(UpdateReference object) {

+				return createUpdateReferenceAdapter();

+			}

+			@Override

+			public Adapter caseModelElementChange(ModelElementChange object) {

+				return createModelElementChangeAdapter();

+			}

+			@Override

+			public Adapter caseUpdateModelElement(UpdateModelElement object) {

+				return createUpdateModelElementAdapter();

+			}

+			@Override

+			public Adapter caseMoveModelElement(MoveModelElement object) {

+				return createMoveModelElementAdapter();

+			}

+			@Override

+			public Adapter defaultCase(EObject object) {

+				return createEObjectAdapter();

+			}

+		};

 

 	/**

 	 * Creates an adapter for the <code>target</code>.

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

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

-	 * 

-	 * @param target

-	 *        the object to adapt.

+	 * @param target the object to adapt.

 	 * @return the adapter for the <code>target</code>.

 	 * @generated

 	 */

@@ -165,16 +147,13 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension

-	 * <em>Generalization Target Changed Extension</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension <em>Generalization Target Changed Extension</em>}'.

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

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

-	 * 

 	 * @return the new adapter.

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension

 	 * @generated

 	 */

 	public Adapter createGeneralizationTargetChangedExtensionAdapter() {

@@ -182,16 +161,13 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension

-	 * <em>Generalization Source Changed Extension</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension <em>Generalization Source Changed Extension</em>}'.

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

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

-	 * 

 	 * @return the new adapter.

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension

 	 * @generated

 	 */

 	public Adapter createGeneralizationSourceChangedExtensionAdapter() {

@@ -199,15 +175,13 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.UMLDiffExtension

-	 * <em>UML Diff Extension</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.UMLDiffExtension <em>UML Diff Extension</em>}'.

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

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

-	 * 

 	 * @return the new adapter.

-	 * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.UMLDiffExtension

+	 * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.UMLDiffExtension

 	 * @generated

 	 */

 	public Adapter createUMLDiffExtensionAdapter() {

@@ -215,13 +189,11 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension

-	 * <em>Abstract Diff Extension</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension <em>Abstract Diff Extension</em>}'.

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

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

-	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension

 	 * @generated

@@ -236,7 +208,6 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

-	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.diff.metamodel.DiffElement

 	 * @generated

@@ -251,7 +222,6 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

-	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.diff.metamodel.ReferenceChange

 	 * @generated

@@ -266,7 +236,6 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

-	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.diff.metamodel.UpdateReference

 	 * @generated

@@ -281,7 +250,6 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

-	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.diff.metamodel.ModelElementChange

 	 * @generated

@@ -296,7 +264,6 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

-	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.diff.metamodel.UpdateModelElement

 	 * @generated

@@ -311,7 +278,6 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

-	 * 

 	 * @return the new adapter.

 	 * @see org.eclipse.emf.compare.diff.metamodel.MoveModelElement

 	 * @generated

@@ -325,7 +291,6 @@ public class Uml_diff_extensionAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null.

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

-	 * 

 	 * @return the new adapter.

 	 * @generated

 	 */

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/util/Uml_diff_extensionSwitch.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/util/Uml_diff_extensionSwitch.java
index ce45ffc64ea..460f45f2a74 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipe/papyrus/uml/compare/diff/uml_diff_extension/util/Uml_diff_extensionSwitch.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src-gen/org/eclipse/papyrus/uml/compare/diff/uml_diff_extension/util/Uml_diff_extensionSwitch.java
@@ -11,9 +11,7 @@
  * 

  * 

  */

-package org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.util;

-

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.*;

+package org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.util;

 

 import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;

 import org.eclipse.emf.compare.diff.metamodel.DiffElement;

@@ -28,26 +26,26 @@ import org.eclipse.emf.ecore.EPackage;
 

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

 

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.*;

+

 /**

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

  * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,

+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)}

+ * to invoke the <code>caseXXX</code> method for each class of the model,

  * starting with the actual class of the object

  * and proceeding up the inheritance hierarchy

  * until a non-null result is returned,

  * which is the result of the switch.

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

- * 

- * @see org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage

+ * @see org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionPackage

  * @generated

  */

 public class Uml_diff_extensionSwitch<T> extends Switch<T> {

-

 	/**

 	 * The cached model package

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

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

-	 * 

 	 * @generated

 	 */

 	protected static Uml_diff_extensionPackage modelPackage;

@@ -56,11 +54,10 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.

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

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

-	 * 

 	 * @generated

 	 */

 	public Uml_diff_extensionSwitch() {

-		if(modelPackage == null) {

+		if (modelPackage == null) {

 			modelPackage = Uml_diff_extensionPackage.eINSTANCE;

 		}

 	}

@@ -69,7 +66,6 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.

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

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

-	 * 

 	 * @parameter ePackage the package in question.

 	 * @return whether this is a switch for the given package.

 	 * @generated

@@ -83,63 +79,43 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.

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

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

-	 * 

 	 * @return the first non-null result returned by a <code>caseXXX</code> call.

 	 * @generated

 	 */

 	@Override

 	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch(classifierID) {

-		case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION:

-		{

-			GeneralizationTargetChangedExtension generalizationTargetChangedExtension = (GeneralizationTargetChangedExtension)theEObject;

-			T result = caseGeneralizationTargetChangedExtension(generalizationTargetChangedExtension);

-			if(result == null)

-				result = caseUMLDiffExtension(generalizationTargetChangedExtension);

-			if(result == null)

-				result = caseUpdateReference(generalizationTargetChangedExtension);

-			if(result == null)

-				result = caseAbstractDiffExtension(generalizationTargetChangedExtension);

-			if(result == null)

-				result = caseReferenceChange(generalizationTargetChangedExtension);

-			if(result == null)

-				result = caseDiffElement(generalizationTargetChangedExtension);

-			if(result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION:

-		{

-			GeneralizationSourceChangedExtension generalizationSourceChangedExtension = (GeneralizationSourceChangedExtension)theEObject;

-			T result = caseGeneralizationSourceChangedExtension(generalizationSourceChangedExtension);

-			if(result == null)

-				result = caseUMLDiffExtension(generalizationSourceChangedExtension);

-			if(result == null)

-				result = caseMoveModelElement(generalizationSourceChangedExtension);

-			if(result == null)

-				result = caseAbstractDiffExtension(generalizationSourceChangedExtension);

-			if(result == null)

-				result = caseUpdateModelElement(generalizationSourceChangedExtension);

-			if(result == null)

-				result = caseModelElementChange(generalizationSourceChangedExtension);

-			if(result == null)

-				result = caseDiffElement(generalizationSourceChangedExtension);

-			if(result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case Uml_diff_extensionPackage.UML_DIFF_EXTENSION:

-		{

-			UMLDiffExtension umlDiffExtension = (UMLDiffExtension)theEObject;

-			T result = caseUMLDiffExtension(umlDiffExtension);

-			if(result == null)

-				result = caseAbstractDiffExtension(umlDiffExtension);

-			if(result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

+		switch (classifierID) {

+			case Uml_diff_extensionPackage.GENERALIZATION_TARGET_CHANGED_EXTENSION: {

+				GeneralizationTargetChangedExtension generalizationTargetChangedExtension = (GeneralizationTargetChangedExtension)theEObject;

+				T result = caseGeneralizationTargetChangedExtension(generalizationTargetChangedExtension);

+				if (result == null) result = caseUMLDiffExtension(generalizationTargetChangedExtension);

+				if (result == null) result = caseUpdateReference(generalizationTargetChangedExtension);

+				if (result == null) result = caseAbstractDiffExtension(generalizationTargetChangedExtension);

+				if (result == null) result = caseReferenceChange(generalizationTargetChangedExtension);

+				if (result == null) result = caseDiffElement(generalizationTargetChangedExtension);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case Uml_diff_extensionPackage.GENERALIZATION_SOURCE_CHANGED_EXTENSION: {

+				GeneralizationSourceChangedExtension generalizationSourceChangedExtension = (GeneralizationSourceChangedExtension)theEObject;

+				T result = caseGeneralizationSourceChangedExtension(generalizationSourceChangedExtension);

+				if (result == null) result = caseUMLDiffExtension(generalizationSourceChangedExtension);

+				if (result == null) result = caseMoveModelElement(generalizationSourceChangedExtension);

+				if (result == null) result = caseAbstractDiffExtension(generalizationSourceChangedExtension);

+				if (result == null) result = caseUpdateModelElement(generalizationSourceChangedExtension);

+				if (result == null) result = caseModelElementChange(generalizationSourceChangedExtension);

+				if (result == null) result = caseDiffElement(generalizationSourceChangedExtension);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			case Uml_diff_extensionPackage.UML_DIFF_EXTENSION: {

+				UMLDiffExtension umlDiffExtension = (UMLDiffExtension)theEObject;

+				T result = caseUMLDiffExtension(umlDiffExtension);

+				if (result == null) result = caseAbstractDiffExtension(umlDiffExtension);

+				if (result == null) result = defaultCase(theEObject);

+				return result;

+			}

+			default: return defaultCase(theEObject);

 		}

 	}

 

@@ -149,9 +125,7 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

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

-	 * 

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Generalization Target Changed Extension</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -166,9 +140,7 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

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

-	 * 

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Generalization Source Changed Extension</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -183,9 +155,7 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

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

-	 * 

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>UML Diff Extension</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -200,9 +170,7 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

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

-	 * 

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Abstract Diff Extension</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -217,9 +185,7 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

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

-	 * 

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -234,9 +200,7 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

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

-	 * 

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Reference Change</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -251,9 +215,7 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

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

-	 * 

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Update Reference</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -268,9 +230,7 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

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

-	 * 

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Model Element Change</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -285,9 +245,7 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

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

-	 * 

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Update Model Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -302,9 +260,7 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch.

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

-	 * 

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>Move Model Element</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

 	 * @generated

@@ -319,9 +275,7 @@ public class Uml_diff_extensionSwitch<T> extends Switch<T> {
 	 * This implementation returns null;

 	 * returning a non-null result will terminate the switch, but this is the last case anyway.

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

-	 * 

-	 * @param object

-	 *        the target of the switch.

+	 * @param object the target of the switch.

 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

 	 * @generated

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/merger/GeneralizationSourceMerger.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/merger/GeneralizationSourceMerger.java
index 922aa4055fb..836898bffeb 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/merger/GeneralizationSourceMerger.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/merger/GeneralizationSourceMerger.java
@@ -13,7 +13,6 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.compare.diff.internal.merger;

 

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension;

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

@@ -21,6 +20,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

 import org.eclipse.papyrus.infra.emf.compare.diff.internal.command.PapyrusMergeCommandProvider;

 import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.MoveModelElementTransactionalMerger;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension;

 import org.eclipse.uml2.uml.Generalization;

 

 /**

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/merger/GeneralizationTargetMerger.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/merger/GeneralizationTargetMerger.java
index 60274103683..270d9bbaff7 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/merger/GeneralizationTargetMerger.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/merger/GeneralizationTargetMerger.java
@@ -13,7 +13,6 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.compare.diff.internal.merger;

 

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension;

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

@@ -21,6 +20,7 @@ import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipReques
 import org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRequest;

 import org.eclipse.papyrus.infra.emf.compare.diff.internal.command.PapyrusMergeCommandProvider;

 import org.eclipse.papyrus.infra.emf.compare.diff.internal.merger.UpdateReferenceTransactionalMerger;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension;

 import org.eclipse.uml2.uml.Generalization;

 

 /**

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/provider/UMLTransactionalMergerProvider.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/provider/UMLTransactionalMergerProvider.java
index a1c46e518dc..83613202bc1 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/provider/UMLTransactionalMergerProvider.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/provider/UMLTransactionalMergerProvider.java
@@ -15,8 +15,6 @@ package org.eclipse.papyrus.uml.compare.diff.internal.provider;
 

 import java.util.Map;

 

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl;

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl;

 import org.eclipse.emf.compare.diff.metamodel.DiffElement;

 import org.eclipse.emf.compare.uml2diff.impl.UMLProfileApplicationAdditionImpl;

 import org.eclipse.emf.compare.uml2diff.impl.UMLProfileApplicationRemovalImpl;

@@ -39,6 +37,8 @@ import org.eclipse.papyrus.uml.compare.diff.internal.merger.UMLProfileApplicatio
 import org.eclipse.papyrus.uml.compare.diff.internal.merger.UMLProfileApplicationRemovalMerger;

 import org.eclipse.papyrus.uml.compare.diff.internal.merger.UMLStereotypeApplicationAdditionMerger;

 import org.eclipse.papyrus.uml.compare.diff.internal.merger.UMLStereotypeApplicationRemovalMerger;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationSourceChangedExtensionImpl;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.impl.GeneralizationTargetChangedExtensionImpl;

 

 

 

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/utils/UMLDiffElementExtensionBuilder.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/utils/UMLDiffElementExtensionBuilder.java
index 6742b84d99e..d8870606965 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/utils/UMLDiffElementExtensionBuilder.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.diff/src/org/eclipse/papyrus/uml/compare/diff/internal/utils/UMLDiffElementExtensionBuilder.java
@@ -13,14 +13,13 @@
  *****************************************************************************/

 package org.eclipse.papyrus.uml.compare.diff.internal.utils;

 

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension;

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension;

-import org.eclipe.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionFactory;

 import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;

 import org.eclipse.emf.compare.diff.metamodel.MoveModelElement;

 import org.eclipse.emf.compare.diff.metamodel.UpdateReference;

 import org.eclipse.emf.compare.diff.metamodel.util.DiffSwitch;

-

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationSourceChangedExtension;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.GeneralizationTargetChangedExtension;

+import org.eclipse.papyrus.uml.compare.diff.uml_diff_extension.Uml_diff_extensionFactory;

 import org.eclipse.uml2.uml.Generalization;