refactor diffExtension model

12 files changed, 512 insertions, 666 deletions

diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/model/uml_diff_extension.ecore b/extraplugins/compare/org.eclipse.papyrus.compare/model/uml_diff_extension.ecore
index 0fb78e3dee0..e003a1766bd 100644
--- a/extraplugins/compare/org.eclipse.papyrus.compare/model/uml_diff_extension.ecore
+++ b/extraplugins/compare/org.eclipse.papyrus.compare/model/uml_diff_extension.ecore
@@ -5,12 +5,12 @@
     nsURI="http://www.eclipse.org/uml/compare/diff_ext/1.0" nsPrefix="uml_diff_extension">
   <eClassifiers xsi:type="ecore:EClass" name="UMLDiffExtension" abstract="true" eSuperTypes="platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//AbstractDiffExtension"/>
   <eClassifiers xsi:type="ecore:EClass" name="StereotypeChange" abstract="true" eSuperTypes="#//UMLDiffExtension"/>
-  <eClassifiers xsi:type="ecore:EClass" name="TaggedValueChange" abstract="true" eSuperTypes="platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//AttributeChange #//UMLDiffExtension"/>
-  <eClassifiers xsi:type="ecore:EClass" name="TaggedValueChangeLeftTarget" eSuperTypes="platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//AttributeChangeLeftTarget #//TaggedValueChange"/>
-  <eClassifiers xsi:type="ecore:EClass" name="TaggedValueChangeRightTarget" eSuperTypes="platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//AttributeChangeRightTarget #//TaggedValueChange"/>
-  <eClassifiers xsi:type="ecore:EClass" name="UpdateTaggedValue" eSuperTypes="platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//UpdateAttribute #//TaggedValueChange"/>
+  <eClassifiers xsi:type="ecore:EClass" name="TaggedValueChange" abstract="true" eSuperTypes="#//UMLDiffExtension platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//AttributeChange"/>
+  <eClassifiers xsi:type="ecore:EClass" name="TaggedValueChangeLeftTarget" eSuperTypes="#//TaggedValueChange platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//AttributeChangeLeftTarget"/>
+  <eClassifiers xsi:type="ecore:EClass" name="TaggedValueChangeRightTarget" eSuperTypes="#//TaggedValueChange platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//AttributeChangeRightTarget"/>
+  <eClassifiers xsi:type="ecore:EClass" name="UpdateTaggedValue" eSuperTypes="#//TaggedValueChange platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//UpdateAttribute"/>
+  <eClassifiers xsi:type="ecore:EClass" name="TaggedValueReferenceChange" eSuperTypes="#//UMLDiffExtension platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//ReferenceChange"/>
   <eClassifiers xsi:type="ecore:EClass" name="AddStereotypeApplication" eSuperTypes="#//StereotypeChange platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//ModelElementChangeRightTarget"/>
   <eClassifiers xsi:type="ecore:EClass" name="RemoveStereotypeApplication" eSuperTypes="#//StereotypeChange platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//ModelElementChangeLeftTarget"/>
-  <eClassifiers xsi:type="ecore:EClass" name="TaggedValueReferenceChange" eSuperTypes="#//UMLDiffExtension platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//ReferenceChange"/>
   <eClassifiers xsi:type="ecore:EClass" name="CompareTwoElementsDiffModel" eSuperTypes="#//UMLDiffExtension platform:/plugin/org.eclipse.emf.compare.diff/model/diff.ecore#//DiffModel"/>
 </ecore:EPackage>
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/TaggedValueChange.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/TaggedValueChange.java
index 2222e1e21ac..e086642e54d 100644
--- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/TaggedValueChange.java
+++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/TaggedValueChange.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension;
 
-import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
 import org.eclipse.emf.compare.diff.metamodel.AttributeChange;
 
 /**
@@ -24,5 +23,5 @@ import org.eclipse.emf.compare.diff.metamodel.AttributeChange;
  * @model abstract="true"
  * @generated
  */
-public interface TaggedValueChange extends AttributeChange, UMLDiffExtension {
+public interface TaggedValueChange extends UMLDiffExtension, AttributeChange {
 } // TaggedValueChange
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/TaggedValueChangeLeftTarget.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/TaggedValueChangeLeftTarget.java
index 6a33c89fbaa..917b5636fb8 100644
--- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/TaggedValueChangeLeftTarget.java
+++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/TaggedValueChangeLeftTarget.java
@@ -23,5 +23,5 @@ import org.eclipse.emf.compare.diff.metamodel.AttributeChangeLeftTarget;
  * @model
  * @generated
  */
-public interface TaggedValueChangeLeftTarget extends AttributeChangeLeftTarget, TaggedValueChange {
+public interface TaggedValueChangeLeftTarget extends TaggedValueChange, AttributeChangeLeftTarget {
 } // TaggedValueChangeLeftTarget
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/TaggedValueChangeRightTarget.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/TaggedValueChangeRightTarget.java
index c72e05cea21..ba3dc255d59 100644
--- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/TaggedValueChangeRightTarget.java
+++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/TaggedValueChangeRightTarget.java
@@ -23,5 +23,5 @@ import org.eclipse.emf.compare.diff.metamodel.AttributeChangeRightTarget;
  * @model
  * @generated
  */
-public interface TaggedValueChangeRightTarget extends AttributeChangeRightTarget, TaggedValueChange {
+public interface TaggedValueChangeRightTarget extends TaggedValueChange, AttributeChangeRightTarget {
 } // TaggedValueChangeRightTarget
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/UMLDiffPackage.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/UMLDiffPackage.java
index 11fe93443b9..321fa246971 100644
--- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/UMLDiffPackage.java
+++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/UMLDiffPackage.java
@@ -149,13 +149,31 @@ public interface UMLDiffPackage extends EPackage {
 	int TAGGED_VALUE_CHANGE = 2;
 
 	/**
+	 * The feature id for the '<em><b>Hide Elements</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAGGED_VALUE_CHANGE__HIDE_ELEMENTS = UML_DIFF_EXTENSION__HIDE_ELEMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Is Collapsed</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int TAGGED_VALUE_CHANGE__IS_COLLAPSED = UML_DIFF_EXTENSION__IS_COLLAPSED;
+
+	/**
 	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS = DiffPackage.ATTRIBUTE_CHANGE__SUB_DIFF_ELEMENTS;
+	int TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS = UML_DIFF_EXTENSION_FEATURE_COUNT + 0;
 
 	/**
 	 * The feature id for the '<em><b>Is Hidden By</b></em>' reference list.
@@ -164,7 +182,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE__IS_HIDDEN_BY = DiffPackage.ATTRIBUTE_CHANGE__IS_HIDDEN_BY;
+	int TAGGED_VALUE_CHANGE__IS_HIDDEN_BY = UML_DIFF_EXTENSION_FEATURE_COUNT + 1;
 
 	/**
 	 * The feature id for the '<em><b>Conflicting</b></em>' attribute.
@@ -173,7 +191,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE__CONFLICTING = DiffPackage.ATTRIBUTE_CHANGE__CONFLICTING;
+	int TAGGED_VALUE_CHANGE__CONFLICTING = UML_DIFF_EXTENSION_FEATURE_COUNT + 2;
 
 	/**
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -182,7 +200,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE__KIND = DiffPackage.ATTRIBUTE_CHANGE__KIND;
+	int TAGGED_VALUE_CHANGE__KIND = UML_DIFF_EXTENSION_FEATURE_COUNT + 3;
 
 	/**
 	 * The feature id for the '<em><b>Remote</b></em>' attribute.
@@ -191,7 +209,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE__REMOTE = DiffPackage.ATTRIBUTE_CHANGE__REMOTE;
+	int TAGGED_VALUE_CHANGE__REMOTE = UML_DIFF_EXTENSION_FEATURE_COUNT + 4;
 
 	/**
 	 * The feature id for the '<em><b>Attribute</b></em>' reference.
@@ -200,7 +218,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE__ATTRIBUTE = DiffPackage.ATTRIBUTE_CHANGE__ATTRIBUTE;
+	int TAGGED_VALUE_CHANGE__ATTRIBUTE = UML_DIFF_EXTENSION_FEATURE_COUNT + 5;
 
 	/**
 	 * The feature id for the '<em><b>Left Element</b></em>' reference.
@@ -209,7 +227,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE__LEFT_ELEMENT = DiffPackage.ATTRIBUTE_CHANGE__LEFT_ELEMENT;
+	int TAGGED_VALUE_CHANGE__LEFT_ELEMENT = UML_DIFF_EXTENSION_FEATURE_COUNT + 6;
 
 	/**
 	 * The feature id for the '<em><b>Right Element</b></em>' reference.
@@ -218,44 +236,44 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE__RIGHT_ELEMENT = DiffPackage.ATTRIBUTE_CHANGE__RIGHT_ELEMENT;
+	int TAGGED_VALUE_CHANGE__RIGHT_ELEMENT = UML_DIFF_EXTENSION_FEATURE_COUNT + 7;
 
 	/**
-	 * The feature id for the '<em><b>Hide Elements</b></em>' reference list.
+	 * The number of structural features of the '<em>Tagged Value Change</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE__HIDE_ELEMENTS = DiffPackage.ATTRIBUTE_CHANGE_FEATURE_COUNT + 0;
+	int TAGGED_VALUE_CHANGE_FEATURE_COUNT = UML_DIFF_EXTENSION_FEATURE_COUNT + 8;
 
 	/**
-	 * The feature id for the '<em><b>Is Collapsed</b></em>' attribute.
+	 * The meta object id for the '{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeLeftTargetImpl <em>Tagged Value Change Left Target</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeLeftTargetImpl
+	 * @see org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.UMLDiffPackageImpl#getTaggedValueChangeLeftTarget()
 	 * @generated
-	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE__IS_COLLAPSED = DiffPackage.ATTRIBUTE_CHANGE_FEATURE_COUNT + 1;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET = 3;
 
 	/**
-	 * The number of structural features of the '<em>Tagged Value Change</em>' class.
+	 * The feature id for the '<em><b>Hide Elements</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_FEATURE_COUNT = DiffPackage.ATTRIBUTE_CHANGE_FEATURE_COUNT + 2;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET__HIDE_ELEMENTS = TAGGED_VALUE_CHANGE__HIDE_ELEMENTS;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeLeftTargetImpl <em>Tagged Value Change Left Target</em>}' class.
+	 * The feature id for the '<em><b>Is Collapsed</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeLeftTargetImpl
-	 * @see org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.UMLDiffPackageImpl#getTaggedValueChangeLeftTarget()
 	 * @generated
+	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET = 3;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET__IS_COLLAPSED = TAGGED_VALUE_CHANGE__IS_COLLAPSED;
 
 	/**
 	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list.
@@ -264,7 +282,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET__SUB_DIFF_ELEMENTS = DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET__SUB_DIFF_ELEMENTS;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET__SUB_DIFF_ELEMENTS = TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Is Hidden By</b></em>' reference list.
@@ -273,7 +291,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET__IS_HIDDEN_BY = DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET__IS_HIDDEN_BY;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET__IS_HIDDEN_BY = TAGGED_VALUE_CHANGE__IS_HIDDEN_BY;
 
 	/**
 	 * The feature id for the '<em><b>Conflicting</b></em>' attribute.
@@ -282,7 +300,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET__CONFLICTING = DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET__CONFLICTING;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET__CONFLICTING = TAGGED_VALUE_CHANGE__CONFLICTING;
 
 	/**
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -291,7 +309,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET__KIND = DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET__KIND;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET__KIND = TAGGED_VALUE_CHANGE__KIND;
 
 	/**
 	 * The feature id for the '<em><b>Remote</b></em>' attribute.
@@ -300,7 +318,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET__REMOTE = DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET__REMOTE;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET__REMOTE = TAGGED_VALUE_CHANGE__REMOTE;
 
 	/**
 	 * The feature id for the '<em><b>Attribute</b></em>' reference.
@@ -309,7 +327,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET__ATTRIBUTE = DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET__ATTRIBUTE;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET__ATTRIBUTE = TAGGED_VALUE_CHANGE__ATTRIBUTE;
 
 	/**
 	 * The feature id for the '<em><b>Left Element</b></em>' reference.
@@ -318,7 +336,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET__LEFT_ELEMENT = DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET__LEFT_ELEMENT;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET__LEFT_ELEMENT = TAGGED_VALUE_CHANGE__LEFT_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Right Element</b></em>' reference.
@@ -327,7 +345,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET__RIGHT_ELEMENT = DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET__RIGHT_ELEMENT;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET__RIGHT_ELEMENT = TAGGED_VALUE_CHANGE__RIGHT_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Left Target</b></em>' attribute.
@@ -336,44 +354,44 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET__LEFT_TARGET = DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET__LEFT_TARGET;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET__LEFT_TARGET = TAGGED_VALUE_CHANGE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Hide Elements</b></em>' reference list.
+	 * The number of structural features of the '<em>Tagged Value Change Left Target</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET__HIDE_ELEMENTS = DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET_FEATURE_COUNT + 0;
+	int TAGGED_VALUE_CHANGE_LEFT_TARGET_FEATURE_COUNT = TAGGED_VALUE_CHANGE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Is Collapsed</b></em>' attribute.
+	 * The meta object id for the '{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeRightTargetImpl <em>Tagged Value Change Right Target</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeRightTargetImpl
+	 * @see org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.UMLDiffPackageImpl#getTaggedValueChangeRightTarget()
 	 * @generated
-	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET__IS_COLLAPSED = DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET_FEATURE_COUNT + 1;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET = 4;
 
 	/**
-	 * The number of structural features of the '<em>Tagged Value Change Left Target</em>' class.
+	 * The feature id for the '<em><b>Hide Elements</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_LEFT_TARGET_FEATURE_COUNT = DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET_FEATURE_COUNT + 2;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__HIDE_ELEMENTS = TAGGED_VALUE_CHANGE__HIDE_ELEMENTS;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeRightTargetImpl <em>Tagged Value Change Right Target</em>}' class.
+	 * The feature id for the '<em><b>Is Collapsed</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeRightTargetImpl
-	 * @see org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.UMLDiffPackageImpl#getTaggedValueChangeRightTarget()
 	 * @generated
+	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET = 4;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__IS_COLLAPSED = TAGGED_VALUE_CHANGE__IS_COLLAPSED;
 
 	/**
 	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list.
@@ -382,7 +400,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__SUB_DIFF_ELEMENTS = DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET__SUB_DIFF_ELEMENTS;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__SUB_DIFF_ELEMENTS = TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Is Hidden By</b></em>' reference list.
@@ -391,7 +409,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__IS_HIDDEN_BY = DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET__IS_HIDDEN_BY;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__IS_HIDDEN_BY = TAGGED_VALUE_CHANGE__IS_HIDDEN_BY;
 
 	/**
 	 * The feature id for the '<em><b>Conflicting</b></em>' attribute.
@@ -400,7 +418,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__CONFLICTING = DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET__CONFLICTING;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__CONFLICTING = TAGGED_VALUE_CHANGE__CONFLICTING;
 
 	/**
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -409,7 +427,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__KIND = DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET__KIND;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__KIND = TAGGED_VALUE_CHANGE__KIND;
 
 	/**
 	 * The feature id for the '<em><b>Remote</b></em>' attribute.
@@ -418,7 +436,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__REMOTE = DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET__REMOTE;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__REMOTE = TAGGED_VALUE_CHANGE__REMOTE;
 
 	/**
 	 * The feature id for the '<em><b>Attribute</b></em>' reference.
@@ -427,7 +445,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__ATTRIBUTE = DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET__ATTRIBUTE;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__ATTRIBUTE = TAGGED_VALUE_CHANGE__ATTRIBUTE;
 
 	/**
 	 * The feature id for the '<em><b>Left Element</b></em>' reference.
@@ -436,7 +454,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__LEFT_ELEMENT = DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET__LEFT_ELEMENT;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__LEFT_ELEMENT = TAGGED_VALUE_CHANGE__LEFT_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Right Element</b></em>' reference.
@@ -445,7 +463,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__RIGHT_ELEMENT = DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET__RIGHT_ELEMENT;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__RIGHT_ELEMENT = TAGGED_VALUE_CHANGE__RIGHT_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Right Target</b></em>' attribute.
@@ -454,44 +472,44 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__RIGHT_TARGET = DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET__RIGHT_TARGET;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__RIGHT_TARGET = TAGGED_VALUE_CHANGE_FEATURE_COUNT + 0;
 
 	/**
-	 * The feature id for the '<em><b>Hide Elements</b></em>' reference list.
+	 * The number of structural features of the '<em>Tagged Value Change Right Target</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__HIDE_ELEMENTS = DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET_FEATURE_COUNT + 0;
+	int TAGGED_VALUE_CHANGE_RIGHT_TARGET_FEATURE_COUNT = TAGGED_VALUE_CHANGE_FEATURE_COUNT + 1;
 
 	/**
-	 * The feature id for the '<em><b>Is Collapsed</b></em>' attribute.
+	 * The meta object id for the '{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.UpdateTaggedValueImpl <em>Update Tagged Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * @see org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.UpdateTaggedValueImpl
+	 * @see org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.UMLDiffPackageImpl#getUpdateTaggedValue()
 	 * @generated
-	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET__IS_COLLAPSED = DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET_FEATURE_COUNT + 1;
+	int UPDATE_TAGGED_VALUE = 5;
 
 	/**
-	 * The number of structural features of the '<em>Tagged Value Change Right Target</em>' class.
+	 * The feature id for the '<em><b>Hide Elements</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
 	 * @ordered
 	 */
-	int TAGGED_VALUE_CHANGE_RIGHT_TARGET_FEATURE_COUNT = DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET_FEATURE_COUNT + 2;
+	int UPDATE_TAGGED_VALUE__HIDE_ELEMENTS = TAGGED_VALUE_CHANGE__HIDE_ELEMENTS;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.UpdateTaggedValueImpl <em>Update Tagged Value</em>}' class.
+	 * The feature id for the '<em><b>Is Collapsed</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.UpdateTaggedValueImpl
-	 * @see org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.UMLDiffPackageImpl#getUpdateTaggedValue()
 	 * @generated
+	 * @ordered
 	 */
-	int UPDATE_TAGGED_VALUE = 5;
+	int UPDATE_TAGGED_VALUE__IS_COLLAPSED = TAGGED_VALUE_CHANGE__IS_COLLAPSED;
 
 	/**
 	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list.
@@ -500,7 +518,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UPDATE_TAGGED_VALUE__SUB_DIFF_ELEMENTS = DiffPackage.UPDATE_ATTRIBUTE__SUB_DIFF_ELEMENTS;
+	int UPDATE_TAGGED_VALUE__SUB_DIFF_ELEMENTS = TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS;
 
 	/**
 	 * The feature id for the '<em><b>Is Hidden By</b></em>' reference list.
@@ -509,7 +527,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UPDATE_TAGGED_VALUE__IS_HIDDEN_BY = DiffPackage.UPDATE_ATTRIBUTE__IS_HIDDEN_BY;
+	int UPDATE_TAGGED_VALUE__IS_HIDDEN_BY = TAGGED_VALUE_CHANGE__IS_HIDDEN_BY;
 
 	/**
 	 * The feature id for the '<em><b>Conflicting</b></em>' attribute.
@@ -518,7 +536,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UPDATE_TAGGED_VALUE__CONFLICTING = DiffPackage.UPDATE_ATTRIBUTE__CONFLICTING;
+	int UPDATE_TAGGED_VALUE__CONFLICTING = TAGGED_VALUE_CHANGE__CONFLICTING;
 
 	/**
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -527,7 +545,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UPDATE_TAGGED_VALUE__KIND = DiffPackage.UPDATE_ATTRIBUTE__KIND;
+	int UPDATE_TAGGED_VALUE__KIND = TAGGED_VALUE_CHANGE__KIND;
 
 	/**
 	 * The feature id for the '<em><b>Remote</b></em>' attribute.
@@ -536,7 +554,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UPDATE_TAGGED_VALUE__REMOTE = DiffPackage.UPDATE_ATTRIBUTE__REMOTE;
+	int UPDATE_TAGGED_VALUE__REMOTE = TAGGED_VALUE_CHANGE__REMOTE;
 
 	/**
 	 * The feature id for the '<em><b>Attribute</b></em>' reference.
@@ -545,7 +563,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UPDATE_TAGGED_VALUE__ATTRIBUTE = DiffPackage.UPDATE_ATTRIBUTE__ATTRIBUTE;
+	int UPDATE_TAGGED_VALUE__ATTRIBUTE = TAGGED_VALUE_CHANGE__ATTRIBUTE;
 
 	/**
 	 * The feature id for the '<em><b>Left Element</b></em>' reference.
@@ -554,7 +572,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UPDATE_TAGGED_VALUE__LEFT_ELEMENT = DiffPackage.UPDATE_ATTRIBUTE__LEFT_ELEMENT;
+	int UPDATE_TAGGED_VALUE__LEFT_ELEMENT = TAGGED_VALUE_CHANGE__LEFT_ELEMENT;
 
 	/**
 	 * The feature id for the '<em><b>Right Element</b></em>' reference.
@@ -563,25 +581,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UPDATE_TAGGED_VALUE__RIGHT_ELEMENT = DiffPackage.UPDATE_ATTRIBUTE__RIGHT_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Hide Elements</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UPDATE_TAGGED_VALUE__HIDE_ELEMENTS = DiffPackage.UPDATE_ATTRIBUTE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Is Collapsed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int UPDATE_TAGGED_VALUE__IS_COLLAPSED = DiffPackage.UPDATE_ATTRIBUTE_FEATURE_COUNT + 1;
+	int UPDATE_TAGGED_VALUE__RIGHT_ELEMENT = TAGGED_VALUE_CHANGE__RIGHT_ELEMENT;
 
 	/**
 	 * The number of structural features of the '<em>Update Tagged Value</em>' class.
@@ -590,7 +590,7 @@ public interface UMLDiffPackage extends EPackage {
 	 * @generated
 	 * @ordered
 	 */
-	int UPDATE_TAGGED_VALUE_FEATURE_COUNT = DiffPackage.UPDATE_ATTRIBUTE_FEATURE_COUNT + 2;
+	int UPDATE_TAGGED_VALUE_FEATURE_COUNT = TAGGED_VALUE_CHANGE_FEATURE_COUNT + 0;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.AddStereotypeApplicationImpl <em>Add Stereotype Application</em>}' class.
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/UpdateTaggedValue.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/UpdateTaggedValue.java
index 6a8159f01b3..2d2706b24a9 100644
--- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/UpdateTaggedValue.java
+++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/UpdateTaggedValue.java
@@ -23,5 +23,5 @@ import org.eclipse.emf.compare.diff.metamodel.UpdateAttribute;
  * @model
  * @generated
  */
-public interface UpdateTaggedValue extends UpdateAttribute, TaggedValueChange {
+public interface UpdateTaggedValue extends TaggedValueChange, UpdateAttribute {
 } // UpdateTaggedValue
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/TaggedValueChangeImpl.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/TaggedValueChangeImpl.java
index 0e86ad80da0..61b96d8002d 100644
--- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/TaggedValueChangeImpl.java
+++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/TaggedValueChangeImpl.java
@@ -17,16 +17,21 @@ import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.compare.diff.merge.IMerger;
 import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
+import org.eclipse.emf.compare.diff.metamodel.AttributeChange;
 import org.eclipse.emf.compare.diff.metamodel.DiffElement;
 import org.eclipse.emf.compare.diff.metamodel.DiffModel;
 import org.eclipse.emf.compare.diff.metamodel.DiffPackage;
+import org.eclipse.emf.compare.diff.metamodel.DifferenceKind;
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.compare.diff.metamodel.impl.AttributeChangeImpl;
 import org.eclipse.emf.compare.util.AdapterUtils;
 
 import org.eclipse.emf.ecore.EClass;
 
+import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
 import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
@@ -42,42 +47,119 @@ import org.eclipse.swt.graphics.Image;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeImpl#getHideElements <em>Hide Elements</em>}</li>
- *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeImpl#isIsCollapsed <em>Is Collapsed</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeImpl#getSubDiffElements <em>Sub Diff Elements</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeImpl#getIsHiddenBy <em>Is Hidden By</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeImpl#isConflicting <em>Conflicting</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeImpl#getKind <em>Kind</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeImpl#isRemote <em>Remote</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeImpl#getAttribute <em>Attribute</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeImpl#getLeftElement <em>Left Element</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeImpl#getRightElement <em>Right Element</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implements TaggedValueChange {
+public abstract class TaggedValueChangeImpl extends UMLDiffExtensionImpl implements TaggedValueChange {
 	/**
-	 * The cached value of the '{@link #getHideElements() <em>Hide Elements</em>}' reference list.
+	 * The cached value of the '{@link #getSubDiffElements() <em>Sub Diff Elements</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getHideElements()
+	 * @see #getSubDiffElements()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<DiffElement> hideElements;
+	protected EList<DiffElement> subDiffElements;
 	/**
-	 * The default value of the '{@link #isIsCollapsed() <em>Is Collapsed</em>}' attribute.
+	 * The cached value of the '{@link #getIsHiddenBy() <em>Is Hidden By</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isIsCollapsed()
+	 * @see #getIsHiddenBy()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final boolean IS_COLLAPSED_EDEFAULT = false;
+	protected EList<AbstractDiffExtension> isHiddenBy;
 	/**
-	 * The cached value of the '{@link #isIsCollapsed() <em>Is Collapsed</em>}' attribute.
+	 * The default value of the '{@link #isConflicting() <em>Conflicting</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isIsCollapsed()
+	 * @see #isConflicting()
 	 * @generated
 	 * @ordered
 	 */
-	protected boolean isCollapsed = IS_COLLAPSED_EDEFAULT;
-
+	protected static final boolean CONFLICTING_EDEFAULT = false;
+	/**
+	 * The cached value of the '{@link #isConflicting() <em>Conflicting</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isConflicting()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean conflicting = CONFLICTING_EDEFAULT;
+	/**
+	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getKind()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final DifferenceKind KIND_EDEFAULT = DifferenceKind.ADDITION;
+	/**
+	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getKind()
+	 * @generated
+	 * @ordered
+	 */
+	protected DifferenceKind kind = KIND_EDEFAULT;
+	/**
+	 * The default value of the '{@link #isRemote() <em>Remote</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isRemote()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final boolean REMOTE_EDEFAULT = false;
+	/**
+	 * The cached value of the '{@link #isRemote() <em>Remote</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #isRemote()
+	 * @generated
+	 * @ordered
+	 */
+	protected boolean remote = REMOTE_EDEFAULT;
+	/**
+	 * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getAttribute()
+	 * @generated
+	 * @ordered
+	 */
+	protected EAttribute attribute;
+	/**
+	 * The cached value of the '{@link #getLeftElement() <em>Left Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getLeftElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject leftElement;
+	/**
+	 * The cached value of the '{@link #getRightElement() <em>Right Element</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #getRightElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected EObject rightElement;
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -102,11 +184,117 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<DiffElement> getHideElements() {
-		if (hideElements == null) {
-			hideElements = new EObjectWithInverseResolvingEList.ManyInverse<DiffElement>(DiffElement.class, this, UMLDiffPackage.TAGGED_VALUE_CHANGE__HIDE_ELEMENTS, DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY);
+	public EList<DiffElement> getSubDiffElements() {
+		if (subDiffElements == null) {
+			subDiffElements = new EObjectContainmentEList<DiffElement>(DiffElement.class, this, UMLDiffPackage.TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS);
+		}
+		return subDiffElements;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EList<AbstractDiffExtension> getIsHiddenBy() {
+		if (isHiddenBy == null) {
+			isHiddenBy = new EObjectWithInverseResolvingEList.ManyInverse<AbstractDiffExtension>(AbstractDiffExtension.class, this, UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_HIDDEN_BY, DiffPackage.ABSTRACT_DIFF_EXTENSION__HIDE_ELEMENTS);
+		}
+		return isHiddenBy;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isConflicting() {
+		return conflicting;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public DifferenceKind getKind() {
+		return kind;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public boolean isRemote() {
+		return remote;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setRemote(boolean newRemote) {
+		boolean oldRemote = remote;
+		remote = newRemote;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDiffPackage.TAGGED_VALUE_CHANGE__REMOTE, oldRemote, remote));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute getAttribute() {
+		if (attribute != null && attribute.eIsProxy()) {
+			InternalEObject oldAttribute = (InternalEObject)attribute;
+			attribute = (EAttribute)eResolveProxy(oldAttribute);
+			if (attribute != oldAttribute) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLDiffPackage.TAGGED_VALUE_CHANGE__ATTRIBUTE, oldAttribute, attribute));
+			}
+		}
+		return attribute;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EAttribute basicGetAttribute() {
+		return attribute;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public void setAttribute(EAttribute newAttribute) {
+		EAttribute oldAttribute = attribute;
+		attribute = newAttribute;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDiffPackage.TAGGED_VALUE_CHANGE__ATTRIBUTE, oldAttribute, attribute));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject getLeftElement() {
+		if (leftElement != null && leftElement.eIsProxy()) {
+			InternalEObject oldLeftElement = (InternalEObject)leftElement;
+			leftElement = eResolveProxy(oldLeftElement);
+			if (leftElement != oldLeftElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLDiffPackage.TAGGED_VALUE_CHANGE__LEFT_ELEMENT, oldLeftElement, leftElement));
+			}
 		}
-		return hideElements;
+		return leftElement;
 	}
 
 	/**
@@ -114,8 +302,8 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public boolean isIsCollapsed() {
-		return isCollapsed;
+	public EObject basicGetLeftElement() {
+		return leftElement;
 	}
 
 	/**
@@ -123,11 +311,37 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setIsCollapsed(boolean newIsCollapsed) {
-		boolean oldIsCollapsed = isCollapsed;
-		isCollapsed = newIsCollapsed;
+	public void setLeftElement(EObject newLeftElement) {
+		EObject oldLeftElement = leftElement;
+		leftElement = newLeftElement;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_COLLAPSED, oldIsCollapsed, isCollapsed));
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDiffPackage.TAGGED_VALUE_CHANGE__LEFT_ELEMENT, oldLeftElement, leftElement));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject getRightElement() {
+		if (rightElement != null && rightElement.eIsProxy()) {
+			InternalEObject oldRightElement = (InternalEObject)rightElement;
+			rightElement = eResolveProxy(oldRightElement);
+			if (rightElement != oldRightElement) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLDiffPackage.TAGGED_VALUE_CHANGE__RIGHT_ELEMENT, oldRightElement, rightElement));
+			}
+		}
+		return rightElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public EObject basicGetRightElement() {
+		return rightElement;
 	}
 
 	/**
@@ -135,10 +349,11 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void visit(DiffModel diffModel) {
-		// TODO: implement this method
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
+	public void setRightElement(EObject newRightElement) {
+		EObject oldRightElement = rightElement;
+		rightElement = newRightElement;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDiffPackage.TAGGED_VALUE_CHANGE__RIGHT_ELEMENT, oldRightElement, rightElement));
 	}
 
 	/**
@@ -170,8 +385,8 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE__HIDE_ELEMENTS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getHideElements()).basicAdd(otherEnd, msgs);
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_HIDDEN_BY:
+				return ((InternalEList<InternalEObject>)(InternalEList<?>)getIsHiddenBy()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -184,8 +399,10 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE__HIDE_ELEMENTS:
-				return ((InternalEList<?>)getHideElements()).basicRemove(otherEnd, msgs);
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS:
+				return ((InternalEList<?>)getSubDiffElements()).basicRemove(otherEnd, msgs);
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_HIDDEN_BY:
+				return ((InternalEList<?>)getIsHiddenBy()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -198,10 +415,25 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE__HIDE_ELEMENTS:
-				return getHideElements();
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_COLLAPSED:
-				return isIsCollapsed();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS:
+				return getSubDiffElements();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_HIDDEN_BY:
+				return getIsHiddenBy();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__CONFLICTING:
+				return isConflicting();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__KIND:
+				return getKind();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__REMOTE:
+				return isRemote();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__ATTRIBUTE:
+				if (resolve) return getAttribute();
+				return basicGetAttribute();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__LEFT_ELEMENT:
+				if (resolve) return getLeftElement();
+				return basicGetLeftElement();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__RIGHT_ELEMENT:
+				if (resolve) return getRightElement();
+				return basicGetRightElement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -215,12 +447,25 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE__HIDE_ELEMENTS:
-				getHideElements().clear();
-				getHideElements().addAll((Collection<? extends DiffElement>)newValue);
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS:
+				getSubDiffElements().clear();
+				getSubDiffElements().addAll((Collection<? extends DiffElement>)newValue);
+				return;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_HIDDEN_BY:
+				getIsHiddenBy().clear();
+				getIsHiddenBy().addAll((Collection<? extends AbstractDiffExtension>)newValue);
+				return;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__REMOTE:
+				setRemote((Boolean)newValue);
+				return;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__ATTRIBUTE:
+				setAttribute((EAttribute)newValue);
+				return;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__LEFT_ELEMENT:
+				setLeftElement((EObject)newValue);
 				return;
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_COLLAPSED:
-				setIsCollapsed((Boolean)newValue);
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__RIGHT_ELEMENT:
+				setRightElement((EObject)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -234,11 +479,23 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE__HIDE_ELEMENTS:
-				getHideElements().clear();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS:
+				getSubDiffElements().clear();
+				return;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_HIDDEN_BY:
+				getIsHiddenBy().clear();
+				return;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__REMOTE:
+				setRemote(REMOTE_EDEFAULT);
+				return;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__ATTRIBUTE:
+				setAttribute((EAttribute)null);
+				return;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__LEFT_ELEMENT:
+				setLeftElement((EObject)null);
 				return;
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_COLLAPSED:
-				setIsCollapsed(IS_COLLAPSED_EDEFAULT);
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__RIGHT_ELEMENT:
+				setRightElement((EObject)null);
 				return;
 		}
 		super.eUnset(featureID);
@@ -252,10 +509,22 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE__HIDE_ELEMENTS:
-				return hideElements != null && !hideElements.isEmpty();
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_COLLAPSED:
-				return isCollapsed != IS_COLLAPSED_EDEFAULT;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS:
+				return subDiffElements != null && !subDiffElements.isEmpty();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_HIDDEN_BY:
+				return isHiddenBy != null && !isHiddenBy.isEmpty();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__CONFLICTING:
+				return conflicting != CONFLICTING_EDEFAULT;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__KIND:
+				return kind != KIND_EDEFAULT;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__REMOTE:
+				return remote != REMOTE_EDEFAULT;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__ATTRIBUTE:
+				return attribute != null;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__LEFT_ELEMENT:
+				return leftElement != null;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE__RIGHT_ELEMENT:
+				return rightElement != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -267,15 +536,21 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == AbstractDiffExtension.class) {
+		if (baseClass == DiffElement.class) {
 			switch (derivedFeatureID) {
-				case UMLDiffPackage.TAGGED_VALUE_CHANGE__HIDE_ELEMENTS: return DiffPackage.ABSTRACT_DIFF_EXTENSION__HIDE_ELEMENTS;
-				case UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_COLLAPSED: return DiffPackage.ABSTRACT_DIFF_EXTENSION__IS_COLLAPSED;
+				case UMLDiffPackage.TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS: return DiffPackage.DIFF_ELEMENT__SUB_DIFF_ELEMENTS;
+				case UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_HIDDEN_BY: return DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY;
+				case UMLDiffPackage.TAGGED_VALUE_CHANGE__CONFLICTING: return DiffPackage.DIFF_ELEMENT__CONFLICTING;
+				case UMLDiffPackage.TAGGED_VALUE_CHANGE__KIND: return DiffPackage.DIFF_ELEMENT__KIND;
+				case UMLDiffPackage.TAGGED_VALUE_CHANGE__REMOTE: return DiffPackage.DIFF_ELEMENT__REMOTE;
 				default: return -1;
 			}
 		}
-		if (baseClass == UMLDiffExtension.class) {
+		if (baseClass == AttributeChange.class) {
 			switch (derivedFeatureID) {
+				case UMLDiffPackage.TAGGED_VALUE_CHANGE__ATTRIBUTE: return DiffPackage.ATTRIBUTE_CHANGE__ATTRIBUTE;
+				case UMLDiffPackage.TAGGED_VALUE_CHANGE__LEFT_ELEMENT: return DiffPackage.ATTRIBUTE_CHANGE__LEFT_ELEMENT;
+				case UMLDiffPackage.TAGGED_VALUE_CHANGE__RIGHT_ELEMENT: return DiffPackage.ATTRIBUTE_CHANGE__RIGHT_ELEMENT;
 				default: return -1;
 			}
 		}
@@ -289,15 +564,21 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == AbstractDiffExtension.class) {
+		if (baseClass == DiffElement.class) {
 			switch (baseFeatureID) {
-				case DiffPackage.ABSTRACT_DIFF_EXTENSION__HIDE_ELEMENTS: return UMLDiffPackage.TAGGED_VALUE_CHANGE__HIDE_ELEMENTS;
-				case DiffPackage.ABSTRACT_DIFF_EXTENSION__IS_COLLAPSED: return UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_COLLAPSED;
+				case DiffPackage.DIFF_ELEMENT__SUB_DIFF_ELEMENTS: return UMLDiffPackage.TAGGED_VALUE_CHANGE__SUB_DIFF_ELEMENTS;
+				case DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY: return UMLDiffPackage.TAGGED_VALUE_CHANGE__IS_HIDDEN_BY;
+				case DiffPackage.DIFF_ELEMENT__CONFLICTING: return UMLDiffPackage.TAGGED_VALUE_CHANGE__CONFLICTING;
+				case DiffPackage.DIFF_ELEMENT__KIND: return UMLDiffPackage.TAGGED_VALUE_CHANGE__KIND;
+				case DiffPackage.DIFF_ELEMENT__REMOTE: return UMLDiffPackage.TAGGED_VALUE_CHANGE__REMOTE;
 				default: return -1;
 			}
 		}
-		if (baseClass == UMLDiffExtension.class) {
+		if (baseClass == AttributeChange.class) {
 			switch (baseFeatureID) {
+				case DiffPackage.ATTRIBUTE_CHANGE__ATTRIBUTE: return UMLDiffPackage.TAGGED_VALUE_CHANGE__ATTRIBUTE;
+				case DiffPackage.ATTRIBUTE_CHANGE__LEFT_ELEMENT: return UMLDiffPackage.TAGGED_VALUE_CHANGE__LEFT_ELEMENT;
+				case DiffPackage.ATTRIBUTE_CHANGE__RIGHT_ELEMENT: return UMLDiffPackage.TAGGED_VALUE_CHANGE__RIGHT_ELEMENT;
 				default: return -1;
 			}
 		}
@@ -314,8 +595,12 @@ public abstract class TaggedValueChangeImpl extends AttributeChangeImpl implemen
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isCollapsed: ");
-		result.append(isCollapsed);
+		result.append(" (conflicting: ");
+		result.append(conflicting);
+		result.append(", kind: ");
+		result.append(kind);
+		result.append(", remote: ");
+		result.append(remote);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/TaggedValueChangeLeftTargetImpl.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/TaggedValueChangeLeftTargetImpl.java
index 0783a14dd03..ad318196718 100644
--- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/TaggedValueChangeLeftTargetImpl.java
+++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/TaggedValueChangeLeftTargetImpl.java
@@ -13,6 +13,7 @@ package org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl;
 
 import java.util.Collection;
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.compare.diff.metamodel.AttributeChangeLeftTarget;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.compare.diff.merge.IMerger;
@@ -44,44 +45,33 @@ import org.eclipse.swt.graphics.Image;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeLeftTargetImpl#getHideElements <em>Hide Elements</em>}</li>
- *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeLeftTargetImpl#isIsCollapsed <em>Is Collapsed</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeLeftTargetImpl#getLeftTarget <em>Left Target</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public class TaggedValueChangeLeftTargetImpl extends AttributeChangeLeftTargetImpl implements TaggedValueChangeLeftTarget {
+public class TaggedValueChangeLeftTargetImpl extends TaggedValueChangeImpl implements TaggedValueChangeLeftTarget {
 
 	/**
-	 * The cached value of the '{@link #getHideElements() <em>Hide Elements</em>}' reference list.
+	 * The default value of the '{@link #getLeftTarget() <em>Left Target</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getHideElements()
+	 * @see #getLeftTarget()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<DiffElement> hideElements;
+	protected static final Object LEFT_TARGET_EDEFAULT = null;
 
 	/**
-	 * The default value of the '{@link #isIsCollapsed() <em>Is Collapsed</em>}' attribute.
+	 * The cached value of the '{@link #getLeftTarget() <em>Left Target</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isIsCollapsed()
+	 * @see #getLeftTarget()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final boolean IS_COLLAPSED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsCollapsed() <em>Is Collapsed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsCollapsed()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isCollapsed = IS_COLLAPSED_EDEFAULT;
+	protected Object leftTarget = LEFT_TARGET_EDEFAULT;
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -107,20 +97,8 @@ public class TaggedValueChangeLeftTargetImpl extends AttributeChangeLeftTargetIm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<DiffElement> getHideElements() {
-		if (hideElements == null) {
-			hideElements = new EObjectWithInverseResolvingEList.ManyInverse<DiffElement>(DiffElement.class, this, UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__HIDE_ELEMENTS, DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY);
-		}
-		return hideElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsCollapsed() {
-		return isCollapsed;
+	public Object getLeftTarget() {
+		return leftTarget;
 	}
 
 	/**
@@ -128,22 +106,11 @@ public class TaggedValueChangeLeftTargetImpl extends AttributeChangeLeftTargetIm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setIsCollapsed(boolean newIsCollapsed) {
-		boolean oldIsCollapsed = isCollapsed;
-		isCollapsed = newIsCollapsed;
+	public void setLeftTarget(Object newLeftTarget) {
+		Object oldLeftTarget = leftTarget;
+		leftTarget = newLeftTarget;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__IS_COLLAPSED, oldIsCollapsed, isCollapsed));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void visit(DiffModel diffModel) {
-		// TODO: implement this method
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__LEFT_TARGET, oldLeftTarget, leftTarget));
 	}
 
 	/**
@@ -180,42 +147,11 @@ public class TaggedValueChangeLeftTargetImpl extends AttributeChangeLeftTargetIm
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__HIDE_ELEMENTS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getHideElements()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__HIDE_ELEMENTS:
-				return ((InternalEList<?>)getHideElements()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__HIDE_ELEMENTS:
-				return getHideElements();
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__IS_COLLAPSED:
-				return isIsCollapsed();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__LEFT_TARGET:
+				return getLeftTarget();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -229,12 +165,8 @@ public class TaggedValueChangeLeftTargetImpl extends AttributeChangeLeftTargetIm
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__HIDE_ELEMENTS:
-				getHideElements().clear();
-				getHideElements().addAll((Collection<? extends DiffElement>)newValue);
-				return;
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__IS_COLLAPSED:
-				setIsCollapsed((Boolean)newValue);
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__LEFT_TARGET:
+				setLeftTarget(newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -248,11 +180,8 @@ public class TaggedValueChangeLeftTargetImpl extends AttributeChangeLeftTargetIm
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__HIDE_ELEMENTS:
-				getHideElements().clear();
-				return;
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__IS_COLLAPSED:
-				setIsCollapsed(IS_COLLAPSED_EDEFAULT);
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__LEFT_TARGET:
+				setLeftTarget(LEFT_TARGET_EDEFAULT);
 				return;
 		}
 		super.eUnset(featureID);
@@ -266,10 +195,8 @@ public class TaggedValueChangeLeftTargetImpl extends AttributeChangeLeftTargetIm
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__HIDE_ELEMENTS:
-				return hideElements != null && !hideElements.isEmpty();
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__IS_COLLAPSED:
-				return isCollapsed != IS_COLLAPSED_EDEFAULT;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__LEFT_TARGET:
+				return LEFT_TARGET_EDEFAULT == null ? leftTarget != null : !LEFT_TARGET_EDEFAULT.equals(leftTarget);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -281,20 +208,9 @@ public class TaggedValueChangeLeftTargetImpl extends AttributeChangeLeftTargetIm
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == AbstractDiffExtension.class) {
-			switch (derivedFeatureID) {
-				case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__HIDE_ELEMENTS: return DiffPackage.ABSTRACT_DIFF_EXTENSION__HIDE_ELEMENTS;
-				case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__IS_COLLAPSED: return DiffPackage.ABSTRACT_DIFF_EXTENSION__IS_COLLAPSED;
-				default: return -1;
-			}
-		}
-		if (baseClass == UMLDiffExtension.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == TaggedValueChange.class) {
+		if (baseClass == AttributeChangeLeftTarget.class) {
 			switch (derivedFeatureID) {
+				case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__LEFT_TARGET: return DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET__LEFT_TARGET;
 				default: return -1;
 			}
 		}
@@ -308,20 +224,9 @@ public class TaggedValueChangeLeftTargetImpl extends AttributeChangeLeftTargetIm
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == AbstractDiffExtension.class) {
-			switch (baseFeatureID) {
-				case DiffPackage.ABSTRACT_DIFF_EXTENSION__HIDE_ELEMENTS: return UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__HIDE_ELEMENTS;
-				case DiffPackage.ABSTRACT_DIFF_EXTENSION__IS_COLLAPSED: return UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__IS_COLLAPSED;
-				default: return -1;
-			}
-		}
-		if (baseClass == UMLDiffExtension.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == TaggedValueChange.class) {
+		if (baseClass == AttributeChangeLeftTarget.class) {
 			switch (baseFeatureID) {
+				case DiffPackage.ATTRIBUTE_CHANGE_LEFT_TARGET__LEFT_TARGET: return UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET__LEFT_TARGET;
 				default: return -1;
 			}
 		}
@@ -338,8 +243,8 @@ public class TaggedValueChangeLeftTargetImpl extends AttributeChangeLeftTargetIm
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isCollapsed: ");
-		result.append(isCollapsed);
+		result.append(" (leftTarget: ");
+		result.append(leftTarget);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/TaggedValueChangeRightTargetImpl.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/TaggedValueChangeRightTargetImpl.java
index 7cc7a56783c..232046985ca 100644
--- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/TaggedValueChangeRightTargetImpl.java
+++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/TaggedValueChangeRightTargetImpl.java
@@ -13,6 +13,7 @@ package org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl;
 
 import java.util.Collection;
 import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.compare.diff.metamodel.AttributeChangeRightTarget;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.compare.diff.merge.IMerger;
@@ -44,42 +45,31 @@ import org.eclipse.swt.graphics.Image;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeRightTargetImpl#getHideElements <em>Hide Elements</em>}</li>
- *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeRightTargetImpl#isIsCollapsed <em>Is Collapsed</em>}</li>
+ *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.TaggedValueChangeRightTargetImpl#getRightTarget <em>Right Target</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public class TaggedValueChangeRightTargetImpl extends AttributeChangeRightTargetImpl implements TaggedValueChangeRightTarget {
+public class TaggedValueChangeRightTargetImpl extends TaggedValueChangeImpl implements TaggedValueChangeRightTarget {
 	/**
-	 * The cached value of the '{@link #getHideElements() <em>Hide Elements</em>}' reference list.
+	 * The default value of the '{@link #getRightTarget() <em>Right Target</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #getHideElements()
+	 * @see #getRightTarget()
 	 * @generated
 	 * @ordered
 	 */
-	protected EList<DiffElement> hideElements;
+	protected static final Object RIGHT_TARGET_EDEFAULT = null;
 	/**
-	 * The default value of the '{@link #isIsCollapsed() <em>Is Collapsed</em>}' attribute.
+	 * The cached value of the '{@link #getRightTarget() <em>Right Target</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see #isIsCollapsed()
+	 * @see #getRightTarget()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final boolean IS_COLLAPSED_EDEFAULT = false;
-	/**
-	 * The cached value of the '{@link #isIsCollapsed() <em>Is Collapsed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsCollapsed()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isCollapsed = IS_COLLAPSED_EDEFAULT;
-
+	protected Object rightTarget = RIGHT_TARGET_EDEFAULT;
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
@@ -104,20 +94,8 @@ public class TaggedValueChangeRightTargetImpl extends AttributeChangeRightTarget
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public EList<DiffElement> getHideElements() {
-		if (hideElements == null) {
-			hideElements = new EObjectWithInverseResolvingEList.ManyInverse<DiffElement>(DiffElement.class, this, UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__HIDE_ELEMENTS, DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY);
-		}
-		return hideElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsCollapsed() {
-		return isCollapsed;
+	public Object getRightTarget() {
+		return rightTarget;
 	}
 
 	/**
@@ -125,22 +103,11 @@ public class TaggedValueChangeRightTargetImpl extends AttributeChangeRightTarget
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	public void setIsCollapsed(boolean newIsCollapsed) {
-		boolean oldIsCollapsed = isCollapsed;
-		isCollapsed = newIsCollapsed;
+	public void setRightTarget(Object newRightTarget) {
+		Object oldRightTarget = rightTarget;
+		rightTarget = newRightTarget;
 		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__IS_COLLAPSED, oldIsCollapsed, isCollapsed));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void visit(DiffModel diffModel) {
-		// TODO: implement this method
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
+			eNotify(new ENotificationImpl(this, Notification.SET, UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__RIGHT_TARGET, oldRightTarget, rightTarget));
 	}
 
 	/**
@@ -177,42 +144,11 @@ public class TaggedValueChangeRightTargetImpl extends AttributeChangeRightTarget
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__HIDE_ELEMENTS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getHideElements()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__HIDE_ELEMENTS:
-				return ((InternalEList<?>)getHideElements()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__HIDE_ELEMENTS:
-				return getHideElements();
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__IS_COLLAPSED:
-				return isIsCollapsed();
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__RIGHT_TARGET:
+				return getRightTarget();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -226,12 +162,8 @@ public class TaggedValueChangeRightTargetImpl extends AttributeChangeRightTarget
 	@Override
 	public void eSet(int featureID, Object newValue) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__HIDE_ELEMENTS:
-				getHideElements().clear();
-				getHideElements().addAll((Collection<? extends DiffElement>)newValue);
-				return;
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__IS_COLLAPSED:
-				setIsCollapsed((Boolean)newValue);
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__RIGHT_TARGET:
+				setRightTarget(newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -245,11 +177,8 @@ public class TaggedValueChangeRightTargetImpl extends AttributeChangeRightTarget
 	@Override
 	public void eUnset(int featureID) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__HIDE_ELEMENTS:
-				getHideElements().clear();
-				return;
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__IS_COLLAPSED:
-				setIsCollapsed(IS_COLLAPSED_EDEFAULT);
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__RIGHT_TARGET:
+				setRightTarget(RIGHT_TARGET_EDEFAULT);
 				return;
 		}
 		super.eUnset(featureID);
@@ -263,10 +192,8 @@ public class TaggedValueChangeRightTargetImpl extends AttributeChangeRightTarget
 	@Override
 	public boolean eIsSet(int featureID) {
 		switch (featureID) {
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__HIDE_ELEMENTS:
-				return hideElements != null && !hideElements.isEmpty();
-			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__IS_COLLAPSED:
-				return isCollapsed != IS_COLLAPSED_EDEFAULT;
+			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__RIGHT_TARGET:
+				return RIGHT_TARGET_EDEFAULT == null ? rightTarget != null : !RIGHT_TARGET_EDEFAULT.equals(rightTarget);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -278,20 +205,9 @@ public class TaggedValueChangeRightTargetImpl extends AttributeChangeRightTarget
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == AbstractDiffExtension.class) {
-			switch (derivedFeatureID) {
-				case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__HIDE_ELEMENTS: return DiffPackage.ABSTRACT_DIFF_EXTENSION__HIDE_ELEMENTS;
-				case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__IS_COLLAPSED: return DiffPackage.ABSTRACT_DIFF_EXTENSION__IS_COLLAPSED;
-				default: return -1;
-			}
-		}
-		if (baseClass == UMLDiffExtension.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == TaggedValueChange.class) {
+		if (baseClass == AttributeChangeRightTarget.class) {
 			switch (derivedFeatureID) {
+				case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__RIGHT_TARGET: return DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET__RIGHT_TARGET;
 				default: return -1;
 			}
 		}
@@ -305,20 +221,9 @@ public class TaggedValueChangeRightTargetImpl extends AttributeChangeRightTarget
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == AbstractDiffExtension.class) {
-			switch (baseFeatureID) {
-				case DiffPackage.ABSTRACT_DIFF_EXTENSION__HIDE_ELEMENTS: return UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__HIDE_ELEMENTS;
-				case DiffPackage.ABSTRACT_DIFF_EXTENSION__IS_COLLAPSED: return UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__IS_COLLAPSED;
-				default: return -1;
-			}
-		}
-		if (baseClass == UMLDiffExtension.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == TaggedValueChange.class) {
+		if (baseClass == AttributeChangeRightTarget.class) {
 			switch (baseFeatureID) {
+				case DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET__RIGHT_TARGET: return UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET__RIGHT_TARGET;
 				default: return -1;
 			}
 		}
@@ -335,8 +240,8 @@ public class TaggedValueChangeRightTargetImpl extends AttributeChangeRightTarget
 		if (eIsProxy()) return super.toString();
 
 		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isCollapsed: ");
-		result.append(isCollapsed);
+		result.append(" (rightTarget: ");
+		result.append(rightTarget);
 		result.append(')');
 		return result.toString();
 	}
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/UMLDiffPackageImpl.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/UMLDiffPackageImpl.java
index 64605fd23ae..aa99b352127 100644
--- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/UMLDiffPackageImpl.java
+++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/UMLDiffPackageImpl.java
@@ -344,14 +344,14 @@ public class UMLDiffPackageImpl extends EPackageImpl implements UMLDiffPackage {
 		// Add supertypes to classes
 		umlDiffExtensionEClass.getESuperTypes().add(theDiffPackage.getAbstractDiffExtension());
 		stereotypeChangeEClass.getESuperTypes().add(this.getUMLDiffExtension());
-		taggedValueChangeEClass.getESuperTypes().add(theDiffPackage.getAttributeChange());
 		taggedValueChangeEClass.getESuperTypes().add(this.getUMLDiffExtension());
-		taggedValueChangeLeftTargetEClass.getESuperTypes().add(theDiffPackage.getAttributeChangeLeftTarget());
+		taggedValueChangeEClass.getESuperTypes().add(theDiffPackage.getAttributeChange());
 		taggedValueChangeLeftTargetEClass.getESuperTypes().add(this.getTaggedValueChange());
-		taggedValueChangeRightTargetEClass.getESuperTypes().add(theDiffPackage.getAttributeChangeRightTarget());
+		taggedValueChangeLeftTargetEClass.getESuperTypes().add(theDiffPackage.getAttributeChangeLeftTarget());
 		taggedValueChangeRightTargetEClass.getESuperTypes().add(this.getTaggedValueChange());
-		updateTaggedValueEClass.getESuperTypes().add(theDiffPackage.getUpdateAttribute());
+		taggedValueChangeRightTargetEClass.getESuperTypes().add(theDiffPackage.getAttributeChangeRightTarget());
 		updateTaggedValueEClass.getESuperTypes().add(this.getTaggedValueChange());
+		updateTaggedValueEClass.getESuperTypes().add(theDiffPackage.getUpdateAttribute());
 		addStereotypeApplicationEClass.getESuperTypes().add(this.getStereotypeChange());
 		addStereotypeApplicationEClass.getESuperTypes().add(theDiffPackage.getModelElementChangeRightTarget());
 		removeStereotypeApplicationEClass.getESuperTypes().add(this.getStereotypeChange());
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/UpdateTaggedValueImpl.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/UpdateTaggedValueImpl.java
index 074d4f26ada..477400ce46d 100644
--- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/UpdateTaggedValueImpl.java
+++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/impl/UpdateTaggedValueImpl.java
@@ -43,46 +43,11 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * An implementation of the model object '<em><b>Update Tagged Value</b></em>'.
  * <!-- end-user-doc -->
  * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.UpdateTaggedValueImpl#getHideElements <em>Hide Elements</em>}</li>
- *   <li>{@link org.eclipse.papyrus.compare.diff.metamodel.uml_diff_extension.impl.UpdateTaggedValueImpl#isIsCollapsed <em>Is Collapsed</em>}</li>
- * </ul>
  * </p>
  *
  * @generated
  */
-public class UpdateTaggedValueImpl extends UpdateAttributeImpl implements UpdateTaggedValue {
-
-	/**
-	 * The cached value of the '{@link #getHideElements() <em>Hide Elements</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHideElements()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<DiffElement> hideElements;
-
-	/**
-	 * The default value of the '{@link #isIsCollapsed() <em>Is Collapsed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsCollapsed()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean IS_COLLAPSED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isIsCollapsed() <em>Is Collapsed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isIsCollapsed()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean isCollapsed = IS_COLLAPSED_EDEFAULT;
+public class UpdateTaggedValueImpl extends TaggedValueChangeImpl implements UpdateTaggedValue {
 
 	/**
 	 * <!-- begin-user-doc -->
@@ -106,50 +71,6 @@ public class UpdateTaggedValueImpl extends UpdateAttributeImpl implements Update
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<DiffElement> getHideElements() {
-		if (hideElements == null) {
-			hideElements = new EObjectWithInverseResolvingEList.ManyInverse<DiffElement>(DiffElement.class, this, UMLDiffPackage.UPDATE_TAGGED_VALUE__HIDE_ELEMENTS, DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY);
-		}
-		return hideElements;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isIsCollapsed() {
-		return isCollapsed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIsCollapsed(boolean newIsCollapsed) {
-		boolean oldIsCollapsed = isCollapsed;
-		isCollapsed = newIsCollapsed;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, UMLDiffPackage.UPDATE_TAGGED_VALUE__IS_COLLAPSED, oldIsCollapsed, isCollapsed));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void visit(DiffModel diffModel) {
-		// TODO: implement this method
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
 	 * 
 	 * @generated NOT
 	 */
@@ -194,174 +115,5 @@ public class UpdateTaggedValueImpl extends UpdateAttributeImpl implements Update
 		return null;
 	}
 
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UMLDiffPackage.UPDATE_TAGGED_VALUE__HIDE_ELEMENTS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getHideElements()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UMLDiffPackage.UPDATE_TAGGED_VALUE__HIDE_ELEMENTS:
-				return ((InternalEList<?>)getHideElements()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UMLDiffPackage.UPDATE_TAGGED_VALUE__HIDE_ELEMENTS:
-				return getHideElements();
-			case UMLDiffPackage.UPDATE_TAGGED_VALUE__IS_COLLAPSED:
-				return isIsCollapsed();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UMLDiffPackage.UPDATE_TAGGED_VALUE__HIDE_ELEMENTS:
-				getHideElements().clear();
-				getHideElements().addAll((Collection<? extends DiffElement>)newValue);
-				return;
-			case UMLDiffPackage.UPDATE_TAGGED_VALUE__IS_COLLAPSED:
-				setIsCollapsed((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UMLDiffPackage.UPDATE_TAGGED_VALUE__HIDE_ELEMENTS:
-				getHideElements().clear();
-				return;
-			case UMLDiffPackage.UPDATE_TAGGED_VALUE__IS_COLLAPSED:
-				setIsCollapsed(IS_COLLAPSED_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UMLDiffPackage.UPDATE_TAGGED_VALUE__HIDE_ELEMENTS:
-				return hideElements != null && !hideElements.isEmpty();
-			case UMLDiffPackage.UPDATE_TAGGED_VALUE__IS_COLLAPSED:
-				return isCollapsed != IS_COLLAPSED_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == AbstractDiffExtension.class) {
-			switch (derivedFeatureID) {
-				case UMLDiffPackage.UPDATE_TAGGED_VALUE__HIDE_ELEMENTS: return DiffPackage.ABSTRACT_DIFF_EXTENSION__HIDE_ELEMENTS;
-				case UMLDiffPackage.UPDATE_TAGGED_VALUE__IS_COLLAPSED: return DiffPackage.ABSTRACT_DIFF_EXTENSION__IS_COLLAPSED;
-				default: return -1;
-			}
-		}
-		if (baseClass == UMLDiffExtension.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == TaggedValueChange.class) {
-			switch (derivedFeatureID) {
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == AbstractDiffExtension.class) {
-			switch (baseFeatureID) {
-				case DiffPackage.ABSTRACT_DIFF_EXTENSION__HIDE_ELEMENTS: return UMLDiffPackage.UPDATE_TAGGED_VALUE__HIDE_ELEMENTS;
-				case DiffPackage.ABSTRACT_DIFF_EXTENSION__IS_COLLAPSED: return UMLDiffPackage.UPDATE_TAGGED_VALUE__IS_COLLAPSED;
-				default: return -1;
-			}
-		}
-		if (baseClass == UMLDiffExtension.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		if (baseClass == TaggedValueChange.class) {
-			switch (baseFeatureID) {
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (isCollapsed: ");
-		result.append(isCollapsed);
-		result.append(')');
-		return result.toString();
-	}
-
 
 } //UpdateTaggedValueImpl
diff --git a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/util/UMLDiffSwitch.java b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/util/UMLDiffSwitch.java
index 7bb9caafa30..bc061816f49 100644
--- a/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/util/UMLDiffSwitch.java
+++ b/extraplugins/compare/org.eclipse.papyrus.compare/src-gen/org/eclipse/papyrus/compare/diff/metamodel/uml_diff_extension/util/UMLDiffSwitch.java
@@ -122,46 +122,46 @@ public class UMLDiffSwitch<T> {
 			case UMLDiffPackage.TAGGED_VALUE_CHANGE: {
 				TaggedValueChange taggedValueChange = (TaggedValueChange)theEObject;
 				T result = caseTaggedValueChange(taggedValueChange);
-				if (result == null) result = caseAttributeChange(taggedValueChange);
 				if (result == null) result = caseUMLDiffExtension(taggedValueChange);
-				if (result == null) result = caseDiffElement(taggedValueChange);
+				if (result == null) result = caseAttributeChange(taggedValueChange);
 				if (result == null) result = caseAbstractDiffExtension(taggedValueChange);
+				if (result == null) result = caseDiffElement(taggedValueChange);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
 			case UMLDiffPackage.TAGGED_VALUE_CHANGE_LEFT_TARGET: {
 				TaggedValueChangeLeftTarget taggedValueChangeLeftTarget = (TaggedValueChangeLeftTarget)theEObject;
 				T result = caseTaggedValueChangeLeftTarget(taggedValueChangeLeftTarget);
-				if (result == null) result = caseAttributeChangeLeftTarget(taggedValueChangeLeftTarget);
 				if (result == null) result = caseTaggedValueChange(taggedValueChangeLeftTarget);
-				if (result == null) result = caseAttributeChange(taggedValueChangeLeftTarget);
+				if (result == null) result = caseAttributeChangeLeftTarget(taggedValueChangeLeftTarget);
 				if (result == null) result = caseUMLDiffExtension(taggedValueChangeLeftTarget);
-				if (result == null) result = caseDiffElement(taggedValueChangeLeftTarget);
+				if (result == null) result = caseAttributeChange(taggedValueChangeLeftTarget);
 				if (result == null) result = caseAbstractDiffExtension(taggedValueChangeLeftTarget);
+				if (result == null) result = caseDiffElement(taggedValueChangeLeftTarget);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
 			case UMLDiffPackage.TAGGED_VALUE_CHANGE_RIGHT_TARGET: {
 				TaggedValueChangeRightTarget taggedValueChangeRightTarget = (TaggedValueChangeRightTarget)theEObject;
 				T result = caseTaggedValueChangeRightTarget(taggedValueChangeRightTarget);
-				if (result == null) result = caseAttributeChangeRightTarget(taggedValueChangeRightTarget);
 				if (result == null) result = caseTaggedValueChange(taggedValueChangeRightTarget);
-				if (result == null) result = caseAttributeChange(taggedValueChangeRightTarget);
+				if (result == null) result = caseAttributeChangeRightTarget(taggedValueChangeRightTarget);
 				if (result == null) result = caseUMLDiffExtension(taggedValueChangeRightTarget);
-				if (result == null) result = caseDiffElement(taggedValueChangeRightTarget);
+				if (result == null) result = caseAttributeChange(taggedValueChangeRightTarget);
 				if (result == null) result = caseAbstractDiffExtension(taggedValueChangeRightTarget);
+				if (result == null) result = caseDiffElement(taggedValueChangeRightTarget);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}
 			case UMLDiffPackage.UPDATE_TAGGED_VALUE: {
 				UpdateTaggedValue updateTaggedValue = (UpdateTaggedValue)theEObject;
 				T result = caseUpdateTaggedValue(updateTaggedValue);
-				if (result == null) result = caseUpdateAttribute(updateTaggedValue);
 				if (result == null) result = caseTaggedValueChange(updateTaggedValue);
-				if (result == null) result = caseAttributeChange(updateTaggedValue);
+				if (result == null) result = caseUpdateAttribute(updateTaggedValue);
 				if (result == null) result = caseUMLDiffExtension(updateTaggedValue);
-				if (result == null) result = caseDiffElement(updateTaggedValue);
+				if (result == null) result = caseAttributeChange(updateTaggedValue);
 				if (result == null) result = caseAbstractDiffExtension(updateTaggedValue);
+				if (result == null) result = caseDiffElement(updateTaggedValue);
 				if (result == null) result = defaultCase(theEObject);
 				return result;
 			}