Introduce the AttributeOrderChange DiffElement.

32 files changed, 907 insertions, 486 deletions

diff --git a/plugins/org.eclipse.emf.compare.diff.edit/icons/full/ctool16/CreateDiffElement_subDiffElements_AttributeOrderChange.gif b/plugins/org.eclipse.emf.compare.diff.edit/icons/full/ctool16/CreateDiffElement_subDiffElements_AttributeOrderChange.gif
new file mode 100644
index 000000000..57dc6d37b
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diff.edit/icons/full/ctool16/CreateDiffElement_subDiffElements_AttributeOrderChange.gif
diff --git a/plugins/org.eclipse.emf.compare.diff.edit/icons/full/ctool16/CreateDiffModel_ownedElements_AttributeOrderChange.gif b/plugins/org.eclipse.emf.compare.diff.edit/icons/full/ctool16/CreateDiffModel_ownedElements_AttributeOrderChange.gif
new file mode 100644
index 000000000..160cd1837
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diff.edit/icons/full/ctool16/CreateDiffModel_ownedElements_AttributeOrderChange.gif
diff --git a/plugins/org.eclipse.emf.compare.diff.edit/icons/full/obj16/AttributeOrderChange.gif b/plugins/org.eclipse.emf.compare.diff.edit/icons/full/obj16/AttributeOrderChange.gif
new file mode 100644
index 000000000..c414fe9f7
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diff.edit/icons/full/obj16/AttributeOrderChange.gif
diff --git a/plugins/org.eclipse.emf.compare.diff.edit/plugin.properties b/plugins/org.eclipse.emf.compare.diff.edit/plugin.properties
index 6326e1c8f..d2810d1d8 100644
--- a/plugins/org.eclipse.emf.compare.diff.edit/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.diff.edit/plugin.properties
@@ -51,7 +51,8 @@ _UI_AddResourceDependency_type = Added dependency on resource {0}
 _UI_RemoveResourceDependency_type = Removed dependency on resource {0}
 _UI_RemoteAddResourceDependency_type = Remotely Added dependency on resource {0}
 _UI_RemoteRemoveResourceDependency_type = Remotely Removed dependency on resource {0}
-_UI_ReferenceOrderChange_type = The order of the reference {0} values has changed
+_UI_ReferenceOrderChange_type = The order of the values of reference {0} has changed
+_UI_AttributeOrderChange_type = The order of the values of attribute {0} has changed
 
 #############################################
 #       END OF TRANSLATED PROPERTIES        #
diff --git a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/AttributeOrderChangeItemProvider.java b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/AttributeOrderChangeItemProvider.java
new file mode 100644
index 000000000..de6011355
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/AttributeOrderChangeItemProvider.java
@@ -0,0 +1,104 @@
+/*******************************************************************************

+ * Copyright (c) 2006, 2011 Obeo.

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

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

+ * which accompanies this distribution, and is available at

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

+ * 

+ * Contributors:

+ *     Obeo - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.emf.compare.diff.provider;

+

+import java.util.Collection;

+import java.util.List;

+

+import org.eclipse.emf.common.notify.AdapterFactory;

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

+import org.eclipse.emf.compare.diff.metamodel.AttributeOrderChange;

+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;

+import org.eclipse.emf.edit.provider.IItemLabelProvider;

+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;

+import org.eclipse.emf.edit.provider.IItemPropertySource;

+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;

+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

+

+/**

+ * This is the item provider adapter for a {@link org.eclipse.emf.compare.diff.metamodel.AttributeOrderChange}

+ * object. <!-- begin-user-doc --> <!-- end-user-doc -->

+ * 

+ * @generated

+ * @since 1.3

+ */

+public class AttributeOrderChangeItemProvider extends AttributeChangeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {

+	/**

+	 * This constructs an instance from a factory and a notifier. <!-- begin-user-doc --> <!-- end-user-doc

+	 * -->

+	 * 

+	 * @generated

+	 */

+	public AttributeOrderChangeItemProvider(AdapterFactory adapterFactory) {

+		super(adapterFactory);

+	}

+

+	/**

+	 * This returns the property descriptors for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc

+	 * -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {

+		if (itemPropertyDescriptors == null) {

+			super.getPropertyDescriptors(object);

+

+		}

+		return itemPropertyDescriptors;

+	}

+

+	/**

+	 * This returns AttributeOrderChange.gif. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	public Object getImage(Object object) {

+		return overlayImage(object, getResourceLocator().getImage("full/obj16/AttributeOrderChange")); //$NON-NLS-1$

+	}

+

+	/**

+	 * This returns the label text for the adapted class. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

+	 * @generated NOT

+	 */

+	@Override

+	public String getText(Object object) {

+		AttributeOrderChange attributeOrderChange = (AttributeOrderChange)object;

+		return getString("_UI_AttributeOrderChange_type", new Object[] {attributeOrderChange.getAttribute().getName()}); //$NON-NLS-1$

+	}

+

+	/**

+	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and

+	 * by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc

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

+	 * 

+	 * @generated

+	 */

+	@Override

+	public void notifyChanged(Notification notification) {

+		updateChildren(notification);

+		super.notifyChanged(notification);

+	}

+

+	/**

+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be

+	 * created under this object. <!-- begin-user-doc --> <!-- end-user-doc -->

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {

+		super.collectNewChildDescriptors(newChildDescriptors, object);

+	}

+

+}

diff --git a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/ComparisonResourceSnapshotItemProvider.java b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/ComparisonResourceSnapshotItemProvider.java
index 2e109d9fb..8a944b3c8 100644
--- a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/ComparisonResourceSnapshotItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/ComparisonResourceSnapshotItemProvider.java
@@ -175,8 +175,8 @@ public class ComparisonResourceSnapshotItemProvider extends ItemProviderAdapter
 				DiffFactory.eINSTANCE.createDiffModel()));
 
 		newChildDescriptors.add(createChildParameter(
-				DiffPackage.Literals.COMPARISON_RESOURCE_SNAPSHOT__MATCH, MatchFactory.eINSTANCE
-						.createMatchModel()));
+				DiffPackage.Literals.COMPARISON_RESOURCE_SNAPSHOT__MATCH,
+				MatchFactory.eINSTANCE.createMatchModel()));
 	}
 
 	/**
diff --git a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/DiffElementItemProvider.java b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/DiffElementItemProvider.java
index 71a7f7513..e371d6ce1 100644
--- a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/DiffElementItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/DiffElementItemProvider.java
@@ -249,6 +249,9 @@ public class DiffElementItemProvider extends ItemProviderAdapter implements IEdi
 				DiffFactory.eINSTANCE.createAttributeChangeRightTarget()));
 
 		newChildDescriptors.add(createChildParameter(DiffPackage.Literals.DIFF_ELEMENT__SUB_DIFF_ELEMENTS,
+				DiffFactory.eINSTANCE.createAttributeOrderChange()));
+
+		newChildDescriptors.add(createChildParameter(DiffPackage.Literals.DIFF_ELEMENT__SUB_DIFF_ELEMENTS,
 				DiffFactory.eINSTANCE.createUpdateAttribute()));
 
 		newChildDescriptors.add(createChildParameter(DiffPackage.Literals.DIFF_ELEMENT__SUB_DIFF_ELEMENTS,
diff --git a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/DiffItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/DiffItemProviderAdapterFactory.java
index f4c1b6896..9ae9818b7 100644
--- a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/DiffItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/DiffItemProviderAdapterFactory.java
@@ -286,6 +286,30 @@ public class DiffItemProviderAdapterFactory extends DiffAdapterFactory implement
 	}
 
 	/**
+	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.compare.diff.metamodel.AttributeOrderChange} instances.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @since 1.3
+	 */
+	protected AttributeOrderChangeItemProvider attributeOrderChangeItemProvider;
+
+	/**
+	 * This creates an adapter for a {@link org.eclipse.emf.compare.diff.metamodel.AttributeOrderChange}.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	@Override
+	public Adapter createAttributeOrderChangeAdapter() {
+		if (attributeOrderChangeItemProvider == null) {
+			attributeOrderChangeItemProvider = new AttributeOrderChangeItemProvider(this);
+		}
+
+		return attributeOrderChangeItemProvider;
+	}
+
+	/**
 	 * This creates an adapter for a {@link org.eclipse.emf.compare.diff.metamodel.ConflictingDiffElement}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
@@ -723,6 +747,8 @@ public class DiffItemProviderAdapterFactory extends DiffAdapterFactory implement
 			attributeChangeLeftTargetItemProvider.dispose();
 		if (attributeChangeRightTargetItemProvider != null)
 			attributeChangeRightTargetItemProvider.dispose();
+		if (attributeOrderChangeItemProvider != null)
+			attributeOrderChangeItemProvider.dispose();
 		if (updateAttributeItemProvider != null)
 			updateAttributeItemProvider.dispose();
 		if (referenceChangeItemProvider != null)
diff --git a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/DiffModelItemProvider.java b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/DiffModelItemProvider.java
index b56b4a5a7..546a6e998 100644
--- a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/DiffModelItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/DiffModelItemProvider.java
@@ -34,7 +34,6 @@ import org.eclipse.emf.edit.provider.ViewerNotification;
 /**
  * This is the item provider adapter for a {@link org.eclipse.emf.compare.diff.metamodel.DiffModel} object.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
- * 
  * @generated
  */
 public class DiffModelItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
@@ -50,11 +49,11 @@ public class DiffModelItemProvider extends ItemProviderAdapter implements IEditi
 	}
 
 	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for
-	 * an {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand}
-	 * or {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}. <!-- begin-user-doc -->
+	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
+	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
+	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -67,8 +66,8 @@ public class DiffModelItemProvider extends ItemProviderAdapter implements IEditi
 	}
 
 	/**
-	 * This returns DiffModel.gif. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * This returns DiffModel.gif.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
@@ -129,9 +128,9 @@ public class DiffModelItemProvider extends ItemProviderAdapter implements IEditi
 	}
 
 	/**
-	 * This adds a property descriptor for the Ancestor Roots feature. <!-- begin-user-doc --> <!--
+	 * This adds a property descriptor for the Ancestor Roots feature.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected void addAncestorRootsPropertyDescriptor(Object object) {
@@ -146,9 +145,9 @@ public class DiffModelItemProvider extends ItemProviderAdapter implements IEditi
 	}
 
 	/**
-	 * Return the resource locator for this item provider's resources. <!-- begin-user-doc --> <!--
+	 * Return the resource locator for this item provider's resources.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -185,10 +184,10 @@ public class DiffModelItemProvider extends ItemProviderAdapter implements IEditi
 	}
 
 	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached children and
-	 * by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. <!-- begin-user-doc
+	 * This handles model notifications by calling {@link #updateChildren} to update any cached
+	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -205,9 +204,9 @@ public class DiffModelItemProvider extends ItemProviderAdapter implements IEditi
 	}
 
 	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children that can be
-	 * created under this object. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+	 * that can be created under this object.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
 	@Override
@@ -248,6 +247,9 @@ public class DiffModelItemProvider extends ItemProviderAdapter implements IEditi
 				DiffFactory.eINSTANCE.createAttributeChangeRightTarget()));
 
 		newChildDescriptors.add(createChildParameter(DiffPackage.Literals.DIFF_MODEL__OWNED_ELEMENTS,
+				DiffFactory.eINSTANCE.createAttributeOrderChange()));
+
+		newChildDescriptors.add(createChildParameter(DiffPackage.Literals.DIFF_MODEL__OWNED_ELEMENTS,
 				DiffFactory.eINSTANCE.createUpdateAttribute()));
 
 		newChildDescriptors.add(createChildParameter(DiffPackage.Literals.DIFF_MODEL__OWNED_ELEMENTS,
@@ -280,7 +282,6 @@ public class DiffModelItemProvider extends ItemProviderAdapter implements IEditi
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/ResourceDependencyChangeLeftTargetItemProvider.java b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/ResourceDependencyChangeLeftTargetItemProvider.java
index 345584353..e030120f6 100644
--- a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/ResourceDependencyChangeLeftTargetItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/ResourceDependencyChangeLeftTargetItemProvider.java
@@ -65,8 +65,8 @@ public class ResourceDependencyChangeLeftTargetItemProvider extends ResourceDepe
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ResourceDependencyChangeLeftTarget")); //$NON-NLS-1$
+		return overlayImage(object,
+				getResourceLocator().getImage("full/obj16/ResourceDependencyChangeLeftTarget")); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/ResourceDependencyChangeRightTargetItemProvider.java b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/ResourceDependencyChangeRightTargetItemProvider.java
index 4acc814e7..6177005f9 100644
--- a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/ResourceDependencyChangeRightTargetItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/ResourceDependencyChangeRightTargetItemProvider.java
@@ -65,8 +65,8 @@ public class ResourceDependencyChangeRightTargetItemProvider extends ResourceDep
 	 */
 	@Override
 	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage(
-				"full/obj16/ResourceDependencyChangeRightTarget")); //$NON-NLS-1$
+		return overlayImage(object,
+				getResourceLocator().getImage("full/obj16/ResourceDependencyChangeRightTarget")); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/UpdateContainmentFeatureItemProvider.java b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/UpdateContainmentFeatureItemProvider.java
index 469b26cd8..410955a9b 100644
--- a/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/UpdateContainmentFeatureItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.diff.edit/src/org/eclipse/emf/compare/diff/provider/UpdateContainmentFeatureItemProvider.java
@@ -50,8 +50,8 @@ public class UpdateContainmentFeatureItemProvider extends MoveModelElementItemPr
 		final UpdateContainmentFeature operation = (UpdateContainmentFeature)object;
 
 		if (operation.isRemote())
-			return overlayImage(object, getResourceLocator().getImage(
-					"full/obj16/RemoteUpdateContainmentFeature")); //$NON-NLS-1$
+			return overlayImage(object,
+					getResourceLocator().getImage("full/obj16/RemoteUpdateContainmentFeature")); //$NON-NLS-1$
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/UpdateContainmentFeature")); //$NON-NLS-1$
 	}
 
diff --git a/plugins/org.eclipse.emf.compare.diff/model/diff.ecore b/plugins/org.eclipse.emf.compare.diff/model/diff.ecore
index 2e431dfea..508232e43 100644
--- a/plugins/org.eclipse.emf.compare.diff/model/diff.ecore
+++ b/plugins/org.eclipse.emf.compare.diff/model/diff.ecore
@@ -1,241 +1,242 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="diff"
-    nsURI="http://www.eclipse.org/emf/compare/diff/1.1" nsPrefix="diff">
-  <eClassifiers xsi:type="ecore:EClass" name="DiffModel">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Root of the differences model for single resources differencing."/>
-    </eAnnotations>
-    <eOperations name="getSubchanges" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
-    <eOperations name="getDifferences" upperBound="-1" eType="#//DiffElement">
-      <eParameters name="modelElement" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-    </eOperations>
-    <eOperations name="getDifferences" upperBound="-1" eType="#//DiffElement"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedElements" upperBound="-1"
-        eType="#//DiffElement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftRoots" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightRoots" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ancestorRoots" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiffResourceSet">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Root of the differences model for ResourceSet-wide differencing."/>
-    </eAnnotations>
-    <eOperations name="getSubchanges" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diffModels" upperBound="-1"
-        eType="#//DiffModel" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resourceDiffs" upperBound="-1"
-        eType="#//ResourceDiff" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiffElement" abstract="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This is the superclass of all types of differences EMF Compare can detect."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="subDiffElements" upperBound="-1"
-        eType="#//DiffElement" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="isHiddenBy" upperBound="-1"
-        eType="#//AbstractDiffExtension" eOpposite="#//AbstractDiffExtension/hideElements"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="conflicting" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"
-        changeable="false" transient="true" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//DifferenceKind"
-        changeable="false" transient="true" defaultValueLiteral="" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remote" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConflictingDiffElement" eSuperTypes="#//DiffElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This will act as a container for conflictual changes."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftParent" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightParent" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="originElement" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiffGroup" eSuperTypes="#//DiffElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="DiffGroups are used as container for differences so that we can maintain the original models' hierarchy within the differences model."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightParent" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="subchanges" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        changeable="false" transient="true" unsettable="true" derived="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ComparisonSnapshot" abstract="true"
-      interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Superclass for classes allowing the serialization of comparison results."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="date" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ComparisonResourceSnapshot" eSuperTypes="#//ComparisonSnapshot">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This can be used to hold the result of single-elements comparison (Resource with Resource, EObject with EObject, ...)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diff" eType="#//DiffModel"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="match" eType="ecore:EClass platform:/plugin/org.eclipse.emf.compare.match/model/match.ecore#//MatchModel"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ComparisonResourceSetSnapshot" eSuperTypes="#//ComparisonSnapshot">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This can be used to hold the result of ResourceSet-wide comparisons."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diffResourceSet" eType="#//DiffResourceSet"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="matchResourceSet" eType="ecore:EClass platform:/plugin/org.eclipse.emf.compare.match/model/match.ecore#//MatchResourceSet"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ModelElementChange" eSuperTypes="#//DiffElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Superclass of DiffElements used to describe element additions or removals."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ModelElementChangeLeftTarget" eSuperTypes="#//ModelElementChange">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A &quot;LeftTarget&quot; element change describes a difference involving the left element/resource. In the case of ModelElementChanges, this can describe either the addition of an element or the remote removal of an element (for three way comparisons)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightParent" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ModelElementChangeRightTarget" eSuperTypes="#//ModelElementChange">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A &quot;RightTarget&quot; element change describes a difference involving the right element/resource. In the case of ModelElementChanges, this can describe either the removal of an element or the remote addition of an element (for three way comparisons)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftParent" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UpdateModelElement" eSuperTypes="#//ModelElementChange">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Superclass of DiffElements used to describe &quot;move&quot; types of differences. This includes both Moving from a container to another and changing the containment reference of an element. These changes imply both an addition and a removal."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MoveModelElement" eSuperTypes="#//UpdateModelElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="These describe a change of container for a given element."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UpdateContainmentFeature" eSuperTypes="#//MoveModelElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This particular kind of move operation describe a change of containment reference of a given element within the same container."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AttributeChange" eSuperTypes="#//DiffElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Superclass of elements describing difference between the values of a given attribute."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AttributeChangeLeftTarget" eSuperTypes="#//AttributeChange">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A &quot;LeftTarget&quot; element change describes a difference involving the left element/resource. In the case of AttributeChanges, these describe differences within multi-valued attributes. Specifically, the addition of a value or the remote removal of a value (for three way comparisons)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="leftTarget" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AttributeChangeRightTarget" eSuperTypes="#//AttributeChange">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A &quot;RightTarget&quot; element change describes a difference involving the right element/resource. In the case of AttributeChanges, these describe differences within multi-valued attributes. Specifically, the removal of a value or the remote addition of a value (for three way comparisons)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rightTarget" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UpdateAttribute" eSuperTypes="#//AttributeChange">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Differences of this kind represent modifications of the value of single-valued attributes."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReferenceChange" eSuperTypes="#//DiffElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Superclass of elements describing difference between the values of a given reference."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReferenceChangeLeftTarget" eSuperTypes="#//ReferenceChange">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A &quot;LeftTarget&quot; element change describes a difference involving the left element/resource. In the case of ReferenceChanges, these describe differences within multi-valued references. Specifically, the addition of a value or the remote removal of a value (for three way comparisons)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReferenceChangeRightTarget" eSuperTypes="#//ReferenceChange">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A &quot;RightTarget&quot; element change describes a difference involving the right element/resource. In the case of ReferenceChanges, these describe differences within multi-valued references. Specifically, the removal of a value or the remote addition of a value (for three way comparisons)."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="UpdateReference" eSuperTypes="#//ReferenceChange">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Differences of this kind represent modifications of the value of single-valued references."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReferenceOrderChange" eSuperTypes="#//ReferenceChange">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="leftTarget" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rightTarget" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractDiffExtension" abstract="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="These can be used to extend the DiffModel so that DiffElements can be collapsed under a single high level difference"/>
-    </eAnnotations>
-    <eOperations name="visit">
-      <eParameters name="diffModel" eType="#//DiffModel"/>
-    </eOperations>
-    <eOperations name="getText" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
-    <eOperations name="getImage" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    <eOperations name="provideMerger" eType="#//IMerger"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="hideElements" upperBound="-1"
-        eType="#//DiffElement" eOpposite="#//DiffElement/isHiddenBy"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isCollapsed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ResourceDiff" eSuperTypes="#//DiffElement">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Differences of this kind represent changes regarding a third-party resource."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ResourceDependencyChange" eSuperTypes="#//ResourceDiff">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Superclass of DiffElements representing additions or removals of references towards a third-party resource."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="roots" upperBound="-1"
-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ResourceDependencyChangeLeftTarget"
-      eSuperTypes="#//ResourceDependencyChange">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A &quot;LeftTarget&quot; element change describes a difference involving the left ResourceSet. These differences can be used to describe additions or remote removals of third-party resources dependencies."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ResourceDependencyChangeRightTarget"
-      eSuperTypes="#//ResourceDependencyChange">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="A &quot;RightTarget&quot; element change describes a difference involving the right ResourceSet. These differences can be used to describe deletions or remote additions of third-party resources dependencies."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="IMerger" instanceClassName="org.eclipse.emf.compare.diff.merge.IMerger"
-      serializable="false">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Can represent mergers provided by a given DiffExtension."/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="DifferenceKind">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="These flags will be used to describe the kind of a DiffElement."/>
-    </eAnnotations>
-    <eLiterals name="Addition"/>
-    <eLiterals name="Deletion" value="1"/>
-    <eLiterals name="Change" value="2"/>
-    <eLiterals name="Move" value="3"/>
-  </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>

+<ecore:EPackage xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="diff"

+    nsURI="http://www.eclipse.org/emf/compare/diff/1.1" nsPrefix="diff">

+  <eClassifiers xsi:type="ecore:EClass" name="DiffModel">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Root of the differences model for single resources differencing."/>

+    </eAnnotations>

+    <eOperations name="getSubchanges" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

+    <eOperations name="getDifferences" upperBound="-1" eType="#//DiffElement">

+      <eParameters name="modelElement" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

+    </eOperations>

+    <eOperations name="getDifferences" upperBound="-1" eType="#//DiffElement"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedElements" upperBound="-1"

+        eType="#//DiffElement" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftRoots" upperBound="-1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightRoots" upperBound="-1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="ancestorRoots" upperBound="-1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DiffResourceSet">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Root of the differences model for ResourceSet-wide differencing."/>

+    </eAnnotations>

+    <eOperations name="getSubchanges" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EInt"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="diffModels" upperBound="-1"

+        eType="#//DiffModel" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="resourceDiffs" upperBound="-1"

+        eType="#//ResourceDiff" containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DiffElement" abstract="true">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="This is the superclass of all types of differences EMF Compare can detect."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="subDiffElements" upperBound="-1"

+        eType="#//DiffElement" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="isHiddenBy" upperBound="-1"

+        eType="#//AbstractDiffExtension" eOpposite="#//AbstractDiffExtension/hideElements"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="conflicting" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EBoolean"

+        changeable="false" transient="true" derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//DifferenceKind"

+        changeable="false" transient="true" defaultValueLiteral="" derived="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="remote" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ConflictingDiffElement" eSuperTypes="#//DiffElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="This will act as a container for conflictual changes."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftParent" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightParent" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="originElement" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="DiffGroup" eSuperTypes="#//DiffElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="DiffGroups are used as container for differences so that we can maintain the original models' hierarchy within the differences model."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightParent" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="subchanges" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"

+        changeable="false" transient="true" unsettable="true" derived="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ComparisonSnapshot" abstract="true"

+      interface="true">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Superclass for classes allowing the serialization of comparison results."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="date" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDate"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ComparisonResourceSnapshot" eSuperTypes="#//ComparisonSnapshot">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="This can be used to hold the result of single-elements comparison (Resource with Resource, EObject with EObject, ...)."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="diff" eType="#//DiffModel"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="match" eType="ecore:EClass platform:/plugin/org.eclipse.emf.compare.match/model/match.ecore#//MatchModel"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ComparisonResourceSetSnapshot" eSuperTypes="#//ComparisonSnapshot">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="This can be used to hold the result of ResourceSet-wide comparisons."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="diffResourceSet" eType="#//DiffResourceSet"

+        containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="matchResourceSet" eType="ecore:EClass platform:/plugin/org.eclipse.emf.compare.match/model/match.ecore#//MatchResourceSet"

+        containment="true"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ModelElementChange" eSuperTypes="#//DiffElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Superclass of DiffElements used to describe element additions or removals."/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ModelElementChangeLeftTarget" eSuperTypes="#//ModelElementChange">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A &quot;LeftTarget&quot; element change describes a difference involving the left element/resource. In the case of ModelElementChanges, this can describe either the addition of an element or the remote removal of an element (for three way comparisons)."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightParent" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ModelElementChangeRightTarget" eSuperTypes="#//ModelElementChange">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A &quot;RightTarget&quot; element change describes a difference involving the right element/resource. In the case of ModelElementChanges, this can describe either the removal of an element or the remote addition of an element (for three way comparisons)."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftParent" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="UpdateModelElement" eSuperTypes="#//ModelElementChange">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Superclass of DiffElements used to describe &quot;move&quot; types of differences. This includes both Moving from a container to another and changing the containment reference of an element. These changes imply both an addition and a removal."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="MoveModelElement" eSuperTypes="#//UpdateModelElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="These describe a change of container for a given element."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="UpdateContainmentFeature" eSuperTypes="#//MoveModelElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="This particular kind of move operation describe a change of containment reference of a given element within the same container."/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AttributeChange" eSuperTypes="#//DiffElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Superclass of elements describing difference between the values of a given attribute."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AttributeChangeLeftTarget" eSuperTypes="#//AttributeChange">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A &quot;LeftTarget&quot; element change describes a difference involving the left element/resource. In the case of AttributeChanges, these describe differences within multi-valued attributes. Specifically, the addition of a value or the remote removal of a value (for three way comparisons)."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="leftTarget" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AttributeChangeRightTarget" eSuperTypes="#//AttributeChange">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A &quot;RightTarget&quot; element change describes a difference involving the right element/resource. In the case of AttributeChanges, these describe differences within multi-valued attributes. Specifically, the removal of a value or the remote addition of a value (for three way comparisons)."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rightTarget" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AttributeOrderChange" eSuperTypes="#//AttributeChange"/>

+  <eClassifiers xsi:type="ecore:EClass" name="UpdateAttribute" eSuperTypes="#//AttributeChange">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Differences of this kind represent modifications of the value of single-valued attributes."/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ReferenceChange" eSuperTypes="#//DiffElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Superclass of elements describing difference between the values of a given reference."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EReference"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ReferenceChangeLeftTarget" eSuperTypes="#//ReferenceChange">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A &quot;LeftTarget&quot; element change describes a difference involving the left element/resource. In the case of ReferenceChanges, these describe differences within multi-valued references. Specifically, the addition of a value or the remote removal of a value (for three way comparisons)."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ReferenceChangeRightTarget" eSuperTypes="#//ReferenceChange">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A &quot;RightTarget&quot; element change describes a difference involving the right element/resource. In the case of ReferenceChanges, these describe differences within multi-valued references. Specifically, the removal of a value or the remote addition of a value (for three way comparisons)."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="UpdateReference" eSuperTypes="#//ReferenceChange">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Differences of this kind represent modifications of the value of single-valued references."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightTarget" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ReferenceOrderChange" eSuperTypes="#//ReferenceChange">

+    <eStructuralFeatures xsi:type="ecore:EReference" name="leftTarget" upperBound="-1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="rightTarget" upperBound="-1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="AbstractDiffExtension" abstract="true">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="These can be used to extend the DiffModel so that DiffElements can be collapsed under a single high level difference"/>

+    </eAnnotations>

+    <eOperations name="visit">

+      <eParameters name="diffModel" eType="#//DiffModel"/>

+    </eOperations>

+    <eOperations name="getText" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>

+    <eOperations name="getImage" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>

+    <eOperations name="provideMerger" eType="#//IMerger"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="hideElements" upperBound="-1"

+        eType="#//DiffElement" eOpposite="#//DiffElement/isHiddenBy"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="isCollapsed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"

+        defaultValueLiteral="false"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ResourceDiff" eSuperTypes="#//DiffElement">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Differences of this kind represent changes regarding a third-party resource."/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ResourceDependencyChange" eSuperTypes="#//ResourceDiff">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Superclass of DiffElements representing additions or removals of references towards a third-party resource."/>

+    </eAnnotations>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="roots" upperBound="-1"

+        eType="ecore:EClass platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"/>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ResourceDependencyChangeLeftTarget"

+      eSuperTypes="#//ResourceDependencyChange">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A &quot;LeftTarget&quot; element change describes a difference involving the left ResourceSet. These differences can be used to describe additions or remote removals of third-party resources dependencies."/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EClass" name="ResourceDependencyChangeRightTarget"

+      eSuperTypes="#//ResourceDependencyChange">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="A &quot;RightTarget&quot; element change describes a difference involving the right ResourceSet. These differences can be used to describe deletions or remote additions of third-party resources dependencies."/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EDataType" name="IMerger" instanceClassName="org.eclipse.emf.compare.diff.merge.IMerger"

+      serializable="false">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="Can represent mergers provided by a given DiffExtension."/>

+    </eAnnotations>

+  </eClassifiers>

+  <eClassifiers xsi:type="ecore:EEnum" name="DifferenceKind">

+    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

+      <details key="documentation" value="These flags will be used to describe the kind of a DiffElement."/>

+    </eAnnotations>

+    <eLiterals name="Addition"/>

+    <eLiterals name="Deletion" value="1"/>

+    <eLiterals name="Change" value="2"/>

+    <eLiterals name="Move" value="3"/>

+  </eClassifiers>

+</ecore:EPackage>

diff --git a/plugins/org.eclipse.emf.compare.diff/model/diff.genmodel b/plugins/org.eclipse.emf.compare.diff/model/diff.genmodel
index aacc646ce..f4dd4d19e 100644
--- a/plugins/org.eclipse.emf.compare.diff/model/diff.genmodel
+++ b/plugins/org.eclipse.emf.compare.diff/model/diff.genmodel
@@ -1,130 +1,131 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.compare.diff/src"
-    modelPluginID="org.eclipse.emf.compare.diff" modelName="Diff" nonNLSMarkers="true"
-    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.compare.match/model/match.genmodel#//match">
-  <foreignModel>diff.ecore</foreignModel>
-  <genPackages prefix="Diff" basePackage="org.eclipse.emf.compare" disposableProviderFactory="true"
-      interfacePackageSuffix="metamodel" metaDataPackageSuffix="metamodel" classPackageSuffix="metamodel.impl"
-      utilityPackageSuffix="metamodel.util" ecorePackage="diff.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="diff.ecore#//DifferenceKind">
-      <genEnumLiterals ecoreEnumLiteral="diff.ecore#//DifferenceKind/Addition"/>
-      <genEnumLiterals ecoreEnumLiteral="diff.ecore#//DifferenceKind/Deletion"/>
-      <genEnumLiterals ecoreEnumLiteral="diff.ecore#//DifferenceKind/Change"/>
-      <genEnumLiterals ecoreEnumLiteral="diff.ecore#//DifferenceKind/Move"/>
-    </genEnums>
-    <genDataTypes ecoreDataType="diff.ecore#//IMerger"/>
-    <genClasses ecoreClass="diff.ecore#//DiffModel">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//DiffModel/ownedElements"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//DiffModel/leftRoots"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//DiffModel/rightRoots"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//DiffModel/ancestorRoots"/>
-      <genOperations ecoreOperation="diff.ecore#//DiffModel/getSubchanges"/>
-      <genOperations ecoreOperation="diff.ecore#//DiffModel/getDifferences">
-        <genParameters ecoreParameter="diff.ecore#//DiffModel/getDifferences/modelElement"/>
-      </genOperations>
-      <genOperations ecoreOperation="diff.ecore#//DiffModel/getDifferences.1"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//DiffResourceSet">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//DiffResourceSet/diffModels"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//DiffResourceSet/resourceDiffs"/>
-      <genOperations ecoreOperation="diff.ecore#//DiffResourceSet/getSubchanges"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="diff.ecore#//DiffElement">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//DiffElement/subDiffElements"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//DiffElement/isHiddenBy"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute diff.ecore#//DiffElement/conflicting"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute diff.ecore#//DiffElement/kind"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diff.ecore#//DiffElement/remote"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//ConflictingDiffElement">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ConflictingDiffElement/leftParent"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ConflictingDiffElement/rightParent"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ConflictingDiffElement/originElement"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//DiffGroup">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//DiffGroup/rightParent"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diff.ecore#//DiffGroup/subchanges"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//ComparisonSnapshot">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diff.ecore#//ComparisonSnapshot/date"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//ComparisonResourceSnapshot">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//ComparisonResourceSnapshot/diff"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//ComparisonResourceSnapshot/match"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//ComparisonResourceSetSnapshot">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//ComparisonResourceSetSnapshot/diffResourceSet"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//ComparisonResourceSetSnapshot/matchResourceSet"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//ModelElementChange"/>
-    <genClasses ecoreClass="diff.ecore#//ModelElementChangeLeftTarget">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ModelElementChangeLeftTarget/rightParent"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ModelElementChangeLeftTarget/leftElement"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//ModelElementChangeRightTarget">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ModelElementChangeRightTarget/leftParent"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ModelElementChangeRightTarget/rightElement"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//UpdateModelElement">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//UpdateModelElement/rightElement"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//UpdateModelElement/leftElement"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//MoveModelElement">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//MoveModelElement/leftTarget"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//MoveModelElement/rightTarget"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//UpdateContainmentFeature"/>
-    <genClasses ecoreClass="diff.ecore#//AttributeChange">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//AttributeChange/attribute"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//AttributeChange/leftElement"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//AttributeChange/rightElement"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//AttributeChangeLeftTarget">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EAttribute diff.ecore#//AttributeChangeLeftTarget/leftTarget"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//AttributeChangeRightTarget">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EAttribute diff.ecore#//AttributeChangeRightTarget/rightTarget"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//UpdateAttribute"/>
-    <genClasses ecoreClass="diff.ecore#//ReferenceChange">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChange/reference"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChange/rightElement"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChange/leftElement"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//ReferenceChangeLeftTarget">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChangeLeftTarget/leftTarget"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChangeLeftTarget/rightTarget"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//ReferenceChangeRightTarget">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChangeRightTarget/rightTarget"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChangeRightTarget/leftTarget"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//UpdateReference">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//UpdateReference/leftTarget"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//UpdateReference/rightTarget"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//ReferenceOrderChange">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceOrderChange/leftTarget"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceOrderChange/rightTarget"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="diff.ecore#//AbstractDiffExtension">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//AbstractDiffExtension/hideElements"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diff.ecore#//AbstractDiffExtension/isCollapsed"/>
-      <genOperations ecoreOperation="diff.ecore#//AbstractDiffExtension/visit">
-        <genParameters ecoreParameter="diff.ecore#//AbstractDiffExtension/visit/diffModel"/>
-      </genOperations>
-      <genOperations ecoreOperation="diff.ecore#//AbstractDiffExtension/getText"/>
-      <genOperations ecoreOperation="diff.ecore#//AbstractDiffExtension/getImage"/>
-      <genOperations ecoreOperation="diff.ecore#//AbstractDiffExtension/provideMerger"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//ResourceDiff"/>
-    <genClasses ecoreClass="diff.ecore#//ResourceDependencyChange">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ResourceDependencyChange/roots"/>
-    </genClasses>
-    <genClasses ecoreClass="diff.ecore#//ResourceDependencyChangeLeftTarget"/>
-    <genClasses ecoreClass="diff.ecore#//ResourceDependencyChangeRightTarget"/>
-  </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0"

+    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.emf.compare.diff/src"

+    modelPluginID="org.eclipse.emf.compare.diff" modelName="Diff" nonNLSMarkers="true"

+    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"

+    usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.compare.match/model/match.genmodel#//match">

+  <foreignModel>diff.ecore</foreignModel>

+  <genPackages prefix="Diff" basePackage="org.eclipse.emf.compare" disposableProviderFactory="true"

+      interfacePackageSuffix="metamodel" metaDataPackageSuffix="metamodel" classPackageSuffix="metamodel.impl"

+      utilityPackageSuffix="metamodel.util" ecorePackage="diff.ecore#/">

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="diff.ecore#//DifferenceKind">

+      <genEnumLiterals ecoreEnumLiteral="diff.ecore#//DifferenceKind/Addition"/>

+      <genEnumLiterals ecoreEnumLiteral="diff.ecore#//DifferenceKind/Deletion"/>

+      <genEnumLiterals ecoreEnumLiteral="diff.ecore#//DifferenceKind/Change"/>

+      <genEnumLiterals ecoreEnumLiteral="diff.ecore#//DifferenceKind/Move"/>

+    </genEnums>

+    <genDataTypes ecoreDataType="diff.ecore#//IMerger"/>

+    <genClasses ecoreClass="diff.ecore#//DiffModel">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//DiffModel/ownedElements"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//DiffModel/leftRoots"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//DiffModel/rightRoots"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//DiffModel/ancestorRoots"/>

+      <genOperations ecoreOperation="diff.ecore#//DiffModel/getSubchanges"/>

+      <genOperations ecoreOperation="diff.ecore#//DiffModel/getDifferences">

+        <genParameters ecoreParameter="diff.ecore#//DiffModel/getDifferences/modelElement"/>

+      </genOperations>

+      <genOperations ecoreOperation="diff.ecore#//DiffModel/getDifferences.1"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//DiffResourceSet">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//DiffResourceSet/diffModels"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//DiffResourceSet/resourceDiffs"/>

+      <genOperations ecoreOperation="diff.ecore#//DiffResourceSet/getSubchanges"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="diff.ecore#//DiffElement">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//DiffElement/subDiffElements"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//DiffElement/isHiddenBy"/>

+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute diff.ecore#//DiffElement/conflicting"/>

+      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute diff.ecore#//DiffElement/kind"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diff.ecore#//DiffElement/remote"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//ConflictingDiffElement">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ConflictingDiffElement/leftParent"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ConflictingDiffElement/rightParent"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ConflictingDiffElement/originElement"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//DiffGroup">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//DiffGroup/rightParent"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diff.ecore#//DiffGroup/subchanges"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//ComparisonSnapshot">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diff.ecore#//ComparisonSnapshot/date"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//ComparisonResourceSnapshot">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//ComparisonResourceSnapshot/diff"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//ComparisonResourceSnapshot/match"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//ComparisonResourceSetSnapshot">

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//ComparisonResourceSetSnapshot/diffResourceSet"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference diff.ecore#//ComparisonResourceSetSnapshot/matchResourceSet"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//ModelElementChange"/>

+    <genClasses ecoreClass="diff.ecore#//ModelElementChangeLeftTarget">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ModelElementChangeLeftTarget/rightParent"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ModelElementChangeLeftTarget/leftElement"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//ModelElementChangeRightTarget">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ModelElementChangeRightTarget/leftParent"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ModelElementChangeRightTarget/rightElement"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//UpdateModelElement">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//UpdateModelElement/rightElement"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//UpdateModelElement/leftElement"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//MoveModelElement">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//MoveModelElement/leftTarget"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//MoveModelElement/rightTarget"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//UpdateContainmentFeature"/>

+    <genClasses ecoreClass="diff.ecore#//AttributeChange">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//AttributeChange/attribute"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//AttributeChange/leftElement"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//AttributeChange/rightElement"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//AttributeChangeLeftTarget">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EAttribute diff.ecore#//AttributeChangeLeftTarget/leftTarget"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//AttributeChangeRightTarget">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EAttribute diff.ecore#//AttributeChangeRightTarget/rightTarget"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//AttributeOrderChange"/>

+    <genClasses ecoreClass="diff.ecore#//UpdateAttribute"/>

+    <genClasses ecoreClass="diff.ecore#//ReferenceChange">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChange/reference"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChange/rightElement"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChange/leftElement"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//ReferenceChangeLeftTarget">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChangeLeftTarget/leftTarget"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChangeLeftTarget/rightTarget"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//ReferenceChangeRightTarget">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChangeRightTarget/rightTarget"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceChangeRightTarget/leftTarget"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//UpdateReference">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//UpdateReference/leftTarget"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//UpdateReference/rightTarget"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//ReferenceOrderChange">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceOrderChange/leftTarget"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ReferenceOrderChange/rightTarget"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="diff.ecore#//AbstractDiffExtension">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//AbstractDiffExtension/hideElements"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute diff.ecore#//AbstractDiffExtension/isCollapsed"/>

+      <genOperations ecoreOperation="diff.ecore#//AbstractDiffExtension/visit">

+        <genParameters ecoreParameter="diff.ecore#//AbstractDiffExtension/visit/diffModel"/>

+      </genOperations>

+      <genOperations ecoreOperation="diff.ecore#//AbstractDiffExtension/getText"/>

+      <genOperations ecoreOperation="diff.ecore#//AbstractDiffExtension/getImage"/>

+      <genOperations ecoreOperation="diff.ecore#//AbstractDiffExtension/provideMerger"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//ResourceDiff"/>

+    <genClasses ecoreClass="diff.ecore#//ResourceDependencyChange">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference diff.ecore#//ResourceDependencyChange/roots"/>

+    </genClasses>

+    <genClasses ecoreClass="diff.ecore#//ResourceDependencyChangeLeftTarget"/>

+    <genClasses ecoreClass="diff.ecore#//ResourceDependencyChangeRightTarget"/>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/emfcomparediffmessages.properties b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/emfcomparediffmessages.properties
index 0b3b7770b..729f7b1b9 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/emfcomparediffmessages.properties
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/emfcomparediffmessages.properties
@@ -39,10 +39,12 @@ RemoteAddAttributeValueImpl.ToString = {0} has been remotely added to attribute
 RemoveAttributeValueImpl.ToString = {0} has been removed from attribute {1} in {2}
 RemoteRemoveAttributeValueImpl.ToString = {0} has been remotely removed from attribute {1} in {2}
 
+AttributeOrderChange.ToString = The order of the values of attribute {0} has been changed
+
 UpdateReferenceImpl.ToString = Reference {0} in {1} changed from {2} to {3}
 RemoteUpdateReferenceImpl.ToString = Reference {0} in {1} remotely changed from {2} to {3}
 
-ReferenceOrderChange.ToString = The order of the values of reference {0} have been changed
+ReferenceOrderChange.ToString = The order of the values of reference {0} has been changed
 
 AddReferenceValueImpl.ToString = {0} has been added to reference {1} in {2}
 RemoteAddReferenceValueImpl.ToString = {0} has been remotely added to reference {1} in {2}
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/AttributeOrderChange.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/AttributeOrderChange.java
new file mode 100644
index 000000000..32bc0dd32
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/AttributeOrderChange.java
@@ -0,0 +1,26 @@
+/*******************************************************************************

+ * Copyright (c) 2006, 2011 Obeo.

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

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

+ * which accompanies this distribution, and is available at

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

+ * 

+ * Contributors:

+ *     Obeo - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.emf.compare.diff.metamodel;

+

+/**

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

+ * A representation of the model object '<em><b>Attribute Order Change</b></em>'.

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

+ *

+ *

+ * @see org.eclipse.emf.compare.diff.metamodel.DiffPackage#getAttributeOrderChange()

+ * @model

+ * @generated

+ * @since 1.3

+ */

+public interface AttributeOrderChange extends AttributeChange {

+	 // AttributeOrderChange

+}

diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/DiffFactory.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/DiffFactory.java
index 2067da361..6748a49fc 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/DiffFactory.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/DiffFactory.java
@@ -54,6 +54,15 @@ public interface DiffFactory extends EFactory {
 	AttributeChangeRightTarget createAttributeChangeRightTarget();
 
 	/**
+	 * Returns a new object of class '<em>Attribute Order Change</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return a new object of class '<em>Attribute Order Change</em>'.
+	 * @generated
+	 */
+	AttributeOrderChange createAttributeOrderChange();
+
+	/**
 	 * Returns a new object of class '<em>Conflicting Diff Element</em>'.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/DiffPackage.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/DiffPackage.java
index b69300642..bfb296431 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/DiffPackage.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/DiffPackage.java
@@ -39,7 +39,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getAbstractDiffExtension()
 	 * @generated
 	 */
-	int ABSTRACT_DIFF_EXTENSION = 23;
+	int ABSTRACT_DIFF_EXTENSION = 24;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.compare.diff.metamodel.impl.DiffElementImpl <em>Element</em>}' class.
@@ -549,7 +549,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getIMerger()
 	 * @generated
 	 */
-	int IMERGER = 29;
+	int IMERGER = 30;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.compare.diff.metamodel.impl.ModelElementChangeImpl <em>Model Element Change</em>}' class.
@@ -783,7 +783,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getReferenceChange()
 	 * @generated
 	 */
-	int REFERENCE_CHANGE = 18;
+	int REFERENCE_CHANGE = 19;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.compare.diff.metamodel.impl.ReferenceChangeLeftTargetImpl <em>Reference Change Left Target</em>}' class.
@@ -792,7 +792,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getReferenceChangeLeftTarget()
 	 * @generated
 	 */
-	int REFERENCE_CHANGE_LEFT_TARGET = 19;
+	int REFERENCE_CHANGE_LEFT_TARGET = 20;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.compare.diff.metamodel.impl.ReferenceChangeRightTargetImpl <em>Reference Change Right Target</em>}' class.
@@ -801,7 +801,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getReferenceChangeRightTarget()
 	 * @generated
 	 */
-	int REFERENCE_CHANGE_RIGHT_TARGET = 20;
+	int REFERENCE_CHANGE_RIGHT_TARGET = 21;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.compare.diff.metamodel.impl.UpdateAttributeImpl <em>Update Attribute</em>}' class.
@@ -810,7 +810,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getUpdateAttribute()
 	 * @generated
 	 */
-	int UPDATE_ATTRIBUTE = 17;
+	int UPDATE_ATTRIBUTE = 18;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.compare.diff.metamodel.impl.UpdateModelElementImpl <em>Update Model Element</em>}' class.
@@ -900,7 +900,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getUpdateReference()
 	 * @generated
 	 */
-	int UPDATE_REFERENCE = 21;
+	int UPDATE_REFERENCE = 22;
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.compare.diff.metamodel.impl.MoveModelElementImpl <em>Move Model Element</em>}' class.
@@ -1363,6 +1363,97 @@ public interface DiffPackage extends EPackage {
 	int ATTRIBUTE_CHANGE_RIGHT_TARGET_FEATURE_COUNT = ATTRIBUTE_CHANGE_FEATURE_COUNT + 1;
 
 	/**
+	 * The meta object id for the '{@link org.eclipse.emf.compare.diff.metamodel.impl.AttributeOrderChangeImpl <em>Attribute Order Change</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see org.eclipse.emf.compare.diff.metamodel.impl.AttributeOrderChangeImpl
+	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getAttributeOrderChange()
+	 * @generated
+	 */
+	int ATTRIBUTE_ORDER_CHANGE = 17;
+
+	/**
+	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_ORDER_CHANGE__SUB_DIFF_ELEMENTS = ATTRIBUTE_CHANGE__SUB_DIFF_ELEMENTS;
+
+	/**
+	 * The feature id for the '<em><b>Is Hidden By</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_ORDER_CHANGE__IS_HIDDEN_BY = ATTRIBUTE_CHANGE__IS_HIDDEN_BY;
+
+	/**
+	 * The feature id for the '<em><b>Conflicting</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_ORDER_CHANGE__CONFLICTING = ATTRIBUTE_CHANGE__CONFLICTING;
+
+	/**
+	 * The feature id for the '<em><b>Kind</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_ORDER_CHANGE__KIND = ATTRIBUTE_CHANGE__KIND;
+
+	/**
+	 * The feature id for the '<em><b>Remote</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_ORDER_CHANGE__REMOTE = ATTRIBUTE_CHANGE__REMOTE;
+
+	/**
+	 * The feature id for the '<em><b>Attribute</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_ORDER_CHANGE__ATTRIBUTE = ATTRIBUTE_CHANGE__ATTRIBUTE;
+
+	/**
+	 * The feature id for the '<em><b>Left Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_ORDER_CHANGE__LEFT_ELEMENT = ATTRIBUTE_CHANGE__LEFT_ELEMENT;
+
+	/**
+	 * The feature id for the '<em><b>Right Element</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_ORDER_CHANGE__RIGHT_ELEMENT = ATTRIBUTE_CHANGE__RIGHT_ELEMENT;
+
+	/**
+	 * The number of structural features of the '<em>Attribute Order Change</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @ordered
+	 */
+	int ATTRIBUTE_ORDER_CHANGE_FEATURE_COUNT = ATTRIBUTE_CHANGE_FEATURE_COUNT + 0;
+
+	/**
 	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
@@ -1829,7 +1920,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getReferenceOrderChange()
 	 * @generated
 	 */
-	int REFERENCE_ORDER_CHANGE = 22;
+	int REFERENCE_ORDER_CHANGE = 23;
 
 	/**
 	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list.
@@ -1965,7 +2056,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getResourceDiff()
 	 * @generated
 	 */
-	int RESOURCE_DIFF = 24;
+	int RESOURCE_DIFF = 25;
 
 	/**
 	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list.
@@ -2029,7 +2120,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getResourceDependencyChange()
 	 * @generated
 	 */
-	int RESOURCE_DEPENDENCY_CHANGE = 25;
+	int RESOURCE_DEPENDENCY_CHANGE = 26;
 
 	/**
 	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list.
@@ -2102,7 +2193,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getResourceDependencyChangeLeftTarget()
 	 * @generated
 	 */
-	int RESOURCE_DEPENDENCY_CHANGE_LEFT_TARGET = 26;
+	int RESOURCE_DEPENDENCY_CHANGE_LEFT_TARGET = 27;
 
 	/**
 	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list.
@@ -2175,7 +2266,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getResourceDependencyChangeRightTarget()
 	 * @generated
 	 */
-	int RESOURCE_DEPENDENCY_CHANGE_RIGHT_TARGET = 27;
+	int RESOURCE_DEPENDENCY_CHANGE_RIGHT_TARGET = 28;
 
 	/**
 	 * The feature id for the '<em><b>Sub Diff Elements</b></em>' containment reference list.
@@ -2247,7 +2338,7 @@ public interface DiffPackage extends EPackage {
 	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getDifferenceKind()
 	 * @generated
 	 */
-	int DIFFERENCE_KIND = 28;
+	int DIFFERENCE_KIND = 29;
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension <em>Abstract Diff Extension</em>}'.
@@ -2416,6 +2507,16 @@ public interface DiffPackage extends EPackage {
 	EAttribute getAttributeChangeRightTarget_RightTarget();
 
 	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.compare.diff.metamodel.AttributeOrderChange <em>Attribute Order Change</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @return the meta object for class '<em>Attribute Order Change</em>'.
+	 * @see org.eclipse.emf.compare.diff.metamodel.AttributeOrderChange
+	 * @generated
+	 */
+	EClass getAttributeOrderChange();
+
+	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.compare.diff.metamodel.ConflictingDiffElement <em>Conflicting Diff Element</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Conflicting Diff Element</em>'.
@@ -3205,6 +3306,16 @@ public interface DiffPackage extends EPackage {
 				.getAttributeChangeRightTarget_RightTarget();
 
 		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.compare.diff.metamodel.impl.AttributeOrderChangeImpl <em>Attribute Order Change</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * @see org.eclipse.emf.compare.diff.metamodel.impl.AttributeOrderChangeImpl
+		 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffPackageImpl#getAttributeOrderChange()
+		 * @generated
+		 */
+		EClass ATTRIBUTE_ORDER_CHANGE = eINSTANCE.getAttributeOrderChange();
+
+		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.compare.diff.metamodel.impl.ConflictingDiffElementImpl <em>Conflicting Diff Element</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
 		 * @see org.eclipse.emf.compare.diff.metamodel.impl.ConflictingDiffElementImpl
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/AbstractDiffExtensionImpl.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/AbstractDiffExtensionImpl.java
index c3eb8d770..c8ad24f6c 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/AbstractDiffExtensionImpl.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/AbstractDiffExtensionImpl.java
@@ -89,7 +89,7 @@ public abstract class AbstractDiffExtensionImpl extends EObjectImpl implements A
 			case DiffPackage.ABSTRACT_DIFF_EXTENSION__HIDE_ELEMENTS:
 				return getHideElements();
 			case DiffPackage.ABSTRACT_DIFF_EXTENSION__IS_COLLAPSED:
-				return isIsCollapsed() ? Boolean.TRUE : Boolean.FALSE;
+				return isIsCollapsed();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -150,7 +150,7 @@ public abstract class AbstractDiffExtensionImpl extends EObjectImpl implements A
 				getHideElements().addAll((Collection<? extends DiffElement>)newValue);
 				return;
 			case DiffPackage.ABSTRACT_DIFF_EXTENSION__IS_COLLAPSED:
-				setIsCollapsed(((Boolean)newValue).booleanValue());
+				setIsCollapsed((Boolean)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/AttributeOrderChangeImpl.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/AttributeOrderChangeImpl.java
new file mode 100644
index 000000000..bde7be8ab
--- /dev/null
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/AttributeOrderChangeImpl.java
@@ -0,0 +1,58 @@
+/*******************************************************************************

+ * Copyright (c) 2006, 2011 Obeo.

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

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

+ * which accompanies this distribution, and is available at

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

+ * 

+ * Contributors:

+ *     Obeo - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.emf.compare.diff.metamodel.impl;

+

+import org.eclipse.emf.compare.diff.EMFCompareDiffMessages;

+import org.eclipse.emf.compare.diff.metamodel.AttributeOrderChange;

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

+import org.eclipse.emf.ecore.EClass;

+

+/**

+ * <!-- begin-user-doc --> An implementation of the model object '<em><b>Attribute Order Change</b></em>'.

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

+ * <p>

+ * </p>

+ * 

+ * @generated

+ * @since 1.3

+ */

+public class AttributeOrderChangeImpl extends AttributeChangeImpl implements AttributeOrderChange {

+	/**

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

+	 * 

+	 * @generated

+	 */

+	protected AttributeOrderChangeImpl() {

+		super();

+	}

+

+	/**

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

+	 * 

+	 * @generated

+	 */

+	@Override

+	protected EClass eStaticClass() {

+		return DiffPackage.Literals.ATTRIBUTE_ORDER_CHANGE;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 * 

+	 * @generated NOT

+	 * @see org.eclipse.emf.compare.diff.metamodel.impl.DiffElementImpl#toString()

+	 */

+	@Override

+	public String toString() {

+		return EMFCompareDiffMessages.getString("AttributeOrderChange.ToString", getAttribute().getName()); //$NON-NLS-1$

+	}

+

+} // AttributeOrderChangeImpl

diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffElementImpl.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffElementImpl.java
index 351436379..8b4da168f 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffElementImpl.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffElementImpl.java
@@ -55,9 +55,8 @@ import org.eclipse.emf.ecore.util.InternalEList;
 
 public abstract class DiffElementImpl extends EObjectImpl implements DiffElement {
 	/**
-	 * The cached value of the '{@link #getSubDiffElements() <em>Sub Diff Elements</em>}' containment
-	 * reference list. <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
+	 * 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
@@ -75,9 +74,9 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 	protected EList<AbstractDiffExtension> isHiddenBy;
 
 	/**
-	 * The default value of the '{@link #isConflicting() <em>Conflicting</em>}' attribute. <!-- begin-user-doc
+	 * The default value of the '{@link #isConflicting() <em>Conflicting</em>}' attribute.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @see #isConflicting()
 	 * @generated
 	 * @ordered
@@ -85,9 +84,9 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 	protected static final boolean CONFLICTING_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isConflicting() <em>Conflicting</em>}' attribute. <!-- begin-user-doc
+	 * The cached value of the '{@link #isConflicting() <em>Conflicting</em>}' attribute.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 * 
 	 * @see #isConflicting()
 	 * @generated
 	 * @ordered
@@ -95,9 +94,9 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 	protected boolean conflicting = CONFLICTING_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getKind()
 	 * @generated
 	 * @ordered
@@ -105,9 +104,9 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 	protected static final DifferenceKind KIND_EDEFAULT = DifferenceKind.ADDITION;
 
 	/**
-	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #getKind()
 	 * @generated
 	 * @ordered
@@ -115,9 +114,9 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 	protected DifferenceKind kind = KIND_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isRemote() <em>Remote</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The default value of the '{@link #isRemote() <em>Remote</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #isRemote()
 	 * @generated
 	 * @ordered
@@ -125,9 +124,9 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 	protected static final boolean REMOTE_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isRemote() <em>Remote</em>}' attribute. <!-- begin-user-doc --> <!--
+	 * The cached value of the '{@link #isRemote() <em>Remote</em>}' attribute.
+	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * 
 	 * @see #isRemote()
 	 * @generated
 	 * @ordered
@@ -136,7 +135,6 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	protected DiffElementImpl() {
@@ -145,7 +143,6 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -156,18 +153,17 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 			case DiffPackage.DIFF_ELEMENT__IS_HIDDEN_BY:
 				return getIsHiddenBy();
 			case DiffPackage.DIFF_ELEMENT__CONFLICTING:
-				return isConflicting() ? Boolean.TRUE : Boolean.FALSE;
+				return isConflicting();
 			case DiffPackage.DIFF_ELEMENT__KIND:
 				return getKind();
 			case DiffPackage.DIFF_ELEMENT__REMOTE:
-				return isRemote() ? Boolean.TRUE : Boolean.FALSE;
+				return isRemote();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -183,7 +179,6 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -199,7 +194,6 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -221,7 +215,6 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -237,7 +230,7 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 				getIsHiddenBy().addAll((Collection<? extends AbstractDiffExtension>)newValue);
 				return;
 			case DiffPackage.DIFF_ELEMENT__REMOTE:
-				setRemote(((Boolean)newValue).booleanValue());
+				setRemote((Boolean)newValue);
 				return;
 		}
 		super.eSet(featureID, newValue);
@@ -245,7 +238,6 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,7 +258,6 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<AbstractDiffExtension> getIsHiddenBy() {
@@ -303,7 +294,6 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public boolean isRemote() {
@@ -312,7 +302,6 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public void setRemote(boolean newRemote) {
@@ -325,7 +314,6 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	public EList<DiffElement> getSubDiffElements() {
@@ -352,7 +340,6 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
@@ -373,7 +360,6 @@ public abstract class DiffElementImpl extends EObjectImpl implements DiffElement
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffFactoryImpl.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffFactoryImpl.java
index 8f68b2dfb..202eeaa2b 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffFactoryImpl.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffFactoryImpl.java
@@ -150,6 +150,8 @@ public class DiffFactoryImpl extends EFactoryImpl implements DiffFactory {
 				return createAttributeChangeLeftTarget();
 			case DiffPackage.ATTRIBUTE_CHANGE_RIGHT_TARGET:
 				return createAttributeChangeRightTarget();
+			case DiffPackage.ATTRIBUTE_ORDER_CHANGE:
+				return createAttributeOrderChange();
 			case DiffPackage.UPDATE_ATTRIBUTE:
 				return createUpdateAttribute();
 			case DiffPackage.REFERENCE_CHANGE:
@@ -204,6 +206,16 @@ public class DiffFactoryImpl extends EFactoryImpl implements DiffFactory {
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	public AttributeOrderChange createAttributeOrderChange() {
+		AttributeOrderChangeImpl attributeOrderChange = new AttributeOrderChangeImpl();
+		return attributeOrderChange;
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffGroupImpl.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffGroupImpl.java
index 5017d72f9..1bc8273a2 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffGroupImpl.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffGroupImpl.java
@@ -97,7 +97,7 @@ public class DiffGroupImpl extends DiffElementImpl implements DiffGroup {
 					return getRightParent();
 				return basicGetRightParent();
 			case DiffPackage.DIFF_GROUP__SUBCHANGES:
-				return new Integer(getSubchanges());
+				return getSubchanges();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffModelImpl.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffModelImpl.java
index 116d338c0..d7d5ee6b4 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffModelImpl.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffModelImpl.java
@@ -271,7 +271,7 @@ public class DiffModelImpl extends EObjectImpl implements DiffModel {
 	 */
 	public EList<DiffElement> getDifferences(EObject modelElement) {
 		List<DiffElement> ownedDifferences = new ArrayList<DiffElement>();
-		
+
 		for (DiffElement diff : getOwnedElements()) {
 			if (diff instanceof DiffGroup || diff instanceof ConflictingDiffElementImpl) {
 				ownedDifferences.addAll(getDifferencesFrom(diff, modelElement));
@@ -282,7 +282,7 @@ public class DiffModelImpl extends EObjectImpl implements DiffModel {
 				}
 			}
 		}
-		
+
 		return new UnmodifiableEList<DiffElement>(ownedDifferences.size(), ownedDifferences.toArray());
 	}
 
@@ -293,7 +293,7 @@ public class DiffModelImpl extends EObjectImpl implements DiffModel {
 	 */
 	public EList<DiffElement> getDifferences() {
 		List<DiffElement> ownedDifferences = new ArrayList<DiffElement>();
-		
+
 		for (DiffElement diff : getOwnedElements()) {
 			if (diff instanceof DiffGroup || diff instanceof ConflictingDiffElementImpl) {
 				ownedDifferences.addAll(getDifferencesFrom(diff));
@@ -302,10 +302,10 @@ public class DiffModelImpl extends EObjectImpl implements DiffModel {
 				ownedDifferences.add(diff);
 			}
 		}
-		
+
 		return new UnmodifiableEList<DiffElement>(ownedDifferences.size(), ownedDifferences.toArray());
 	}
-	
+
 	/**
 	 * Returns the list of all sub-differences of the given DiffGroup recursively.
 	 * 
@@ -316,7 +316,7 @@ public class DiffModelImpl extends EObjectImpl implements DiffModel {
 	 */
 	private EList<DiffElement> getDifferencesFrom(DiffElement group) {
 		EList<DiffElement> ownedDifferences = new BasicEList<DiffElement>();
-		
+
 		for (DiffElement diff : group.getSubDiffElements()) {
 			if (diff instanceof DiffGroup || diff instanceof ConflictingDiffElementImpl) {
 				ownedDifferences.addAll(getDifferencesFrom(diff));
@@ -324,10 +324,10 @@ public class DiffModelImpl extends EObjectImpl implements DiffModel {
 				ownedDifferences.add(diff);
 			}
 		}
-		
+
 		return ownedDifferences;
 	}
-	
+
 	/**
 	 * Returns the list of all sub-differences of the given DiffGroup that concern the given EObject,
 	 * recursively.
@@ -341,7 +341,7 @@ public class DiffModelImpl extends EObjectImpl implements DiffModel {
 	 */
 	private EList<DiffElement> getDifferencesFrom(DiffElement group, EObject modelElement) {
 		EList<DiffElement> ownedDifferences = new BasicEList<DiffElement>();
-		
+
 		for (DiffElement diff : group.getSubDiffElements()) {
 			if (diff instanceof DiffGroup || diff instanceof ConflictingDiffElementImpl) {
 				ownedDifferences.addAll(getDifferencesFrom(diff));
@@ -351,10 +351,10 @@ public class DiffModelImpl extends EObjectImpl implements DiffModel {
 				}
 			}
 		}
-		
+
 		return ownedDifferences;
 	}
-	
+
 	/**
 	 * This will return <code>true</code> iff the given DiffElement concerns the given EObject.
 	 * 
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffPackageImpl.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffPackageImpl.java
index 7908afe40..cf6aa79af 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffPackageImpl.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/DiffPackageImpl.java
@@ -15,6 +15,7 @@ import org.eclipse.emf.compare.diff.metamodel.AbstractDiffExtension;
 import org.eclipse.emf.compare.diff.metamodel.AttributeChange;
 import org.eclipse.emf.compare.diff.metamodel.AttributeChangeLeftTarget;
 import org.eclipse.emf.compare.diff.metamodel.AttributeChangeRightTarget;
+import org.eclipse.emf.compare.diff.metamodel.AttributeOrderChange;
 import org.eclipse.emf.compare.diff.metamodel.ComparisonResourceSetSnapshot;
 import org.eclipse.emf.compare.diff.metamodel.ComparisonResourceSnapshot;
 import org.eclipse.emf.compare.diff.metamodel.ComparisonSnapshot;
@@ -113,6 +114,13 @@ public class DiffPackageImpl extends EPackageImpl implements DiffPackage {
 	private EClass attributeChangeRightTargetEClass = null;
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 */
+	private EClass attributeOrderChangeEClass = null;
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -298,9 +306,8 @@ public class DiffPackageImpl extends EPackageImpl implements DiffPackage {
 			return (DiffPackage)EPackage.Registry.INSTANCE.getEPackage(DiffPackage.eNS_URI);
 
 		// Obtain or create and register package
-		DiffPackageImpl theDiffPackage = (DiffPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DiffPackageImpl ? EPackage.Registry.INSTANCE
-				.getEPackage(eNS_URI)
-				: new DiffPackageImpl());
+		DiffPackageImpl theDiffPackage = (DiffPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DiffPackageImpl ? EPackage.Registry.INSTANCE
+				.get(eNS_URI) : new DiffPackageImpl());
 
 		isInited = true;
 
@@ -317,6 +324,8 @@ public class DiffPackageImpl extends EPackageImpl implements DiffPackage {
 		// Mark meta-data to indicate it can't be changed
 		theDiffPackage.freeze();
 
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(DiffPackage.eNS_URI, theDiffPackage);
 		return theDiffPackage;
 	}
 
@@ -403,6 +412,8 @@ public class DiffPackageImpl extends EPackageImpl implements DiffPackage {
 		attributeChangeRightTargetEClass = createEClass(ATTRIBUTE_CHANGE_RIGHT_TARGET);
 		createEAttribute(attributeChangeRightTargetEClass, ATTRIBUTE_CHANGE_RIGHT_TARGET__RIGHT_TARGET);
 
+		attributeOrderChangeEClass = createEClass(ATTRIBUTE_ORDER_CHANGE);
+
 		updateAttributeEClass = createEClass(UPDATE_ATTRIBUTE);
 
 		referenceChangeEClass = createEClass(REFERENCE_CHANGE);
@@ -575,6 +586,16 @@ public class DiffPackageImpl extends EPackageImpl implements DiffPackage {
 	}
 
 	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @generated
+	 * @since 1.3
+	 */
+	public EClass getAttributeOrderChange() {
+		return attributeOrderChangeEClass;
+	}
+
+	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * @generated
 	 */
@@ -1120,6 +1141,7 @@ public class DiffPackageImpl extends EPackageImpl implements DiffPackage {
 		attributeChangeEClass.getESuperTypes().add(this.getDiffElement());
 		attributeChangeLeftTargetEClass.getESuperTypes().add(this.getAttributeChange());
 		attributeChangeRightTargetEClass.getESuperTypes().add(this.getAttributeChange());
+		attributeOrderChangeEClass.getESuperTypes().add(this.getAttributeChange());
 		updateAttributeEClass.getESuperTypes().add(this.getAttributeChange());
 		referenceChangeEClass.getESuperTypes().add(this.getDiffElement());
 		referenceChangeLeftTargetEClass.getESuperTypes().add(this.getReferenceChange());
@@ -1358,6 +1380,9 @@ public class DiffPackageImpl extends EPackageImpl implements DiffPackage {
 				theEcorePackage.getEJavaObject(),
 				"rightTarget", null, 0, 1, AttributeChangeRightTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
 
+		initEClass(attributeOrderChangeEClass, AttributeOrderChange.class,
+				"AttributeOrderChange", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+
 		initEClass(updateAttributeEClass, UpdateAttribute.class,
 				"UpdateAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
 
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/MoveModelElementImpl.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/MoveModelElementImpl.java
index e56fafb40..8c361ea5d 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/MoveModelElementImpl.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/MoveModelElementImpl.java
@@ -217,9 +217,10 @@ public class MoveModelElementImpl extends UpdateModelElementImpl implements Move
 		String toString = null;
 		if (isRemote()) {
 			try {
-				toString = EMFCompareDiffMessages.getString("RemoteMoveModelElementImpl.ToString", //$NON-NLS-1$
-						NameSimilarity.findName(leftElement), leftElement.eContainer(), rightElement
-								.eContainer());
+				toString = EMFCompareDiffMessages.getString(
+						"RemoteMoveModelElementImpl.ToString", //$NON-NLS-1$
+						NameSimilarity.findName(leftElement), leftElement.eContainer(),
+						rightElement.eContainer());
 			} catch (final FactoryException e) {
 				toString = EMFCompareDiffMessages.getString("RemoteMoveModelElementImpl.ToString", //$NON-NLS-1$
 						leftElement.eClass().getName(), leftElement.eContainer(), rightElement.eContainer());
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/ReferenceChangeLeftTargetImpl.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/ReferenceChangeLeftTargetImpl.java
index 6ef349333..97481c117 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/ReferenceChangeLeftTargetImpl.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/ReferenceChangeLeftTargetImpl.java
@@ -226,9 +226,10 @@ public class ReferenceChangeLeftTargetImpl extends ReferenceChangeImpl implement
 		String toString = null;
 		if (isRemote()) {
 			try {
-				toString = EMFCompareDiffMessages.getString("RemoteRemoveReferenceValueImpl.ToString", //$NON-NLS-1$
-						NameSimilarity.findName(rightTarget), reference.getName(), NameSimilarity
-								.findName(leftElement));
+				toString = EMFCompareDiffMessages.getString(
+						"RemoteRemoveReferenceValueImpl.ToString", //$NON-NLS-1$
+						NameSimilarity.findName(rightTarget), reference.getName(),
+						NameSimilarity.findName(leftElement));
 			} catch (final FactoryException e) {
 				toString = EMFCompareDiffMessages.getString("RemoteRemoveReferenceValueImpl.ToString", //$NON-NLS-1$
 						rightTarget.eClass().getName(), reference.getName(), leftElement.eClass().getName());
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/ReferenceChangeRightTargetImpl.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/ReferenceChangeRightTargetImpl.java
index 63d922f35..25eec8dd1 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/ReferenceChangeRightTargetImpl.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/ReferenceChangeRightTargetImpl.java
@@ -226,18 +226,20 @@ public class ReferenceChangeRightTargetImpl extends ReferenceChangeImpl implemen
 		String toString = null;
 		if (isRemote()) {
 			try {
-				toString = EMFCompareDiffMessages.getString("RemoteAddReferenceValueImpl.ToString", //$NON-NLS-1$
-						NameSimilarity.findName(leftTarget), reference.getName(), NameSimilarity
-								.findName(rightElement));
+				toString = EMFCompareDiffMessages.getString(
+						"RemoteAddReferenceValueImpl.ToString", //$NON-NLS-1$
+						NameSimilarity.findName(leftTarget), reference.getName(),
+						NameSimilarity.findName(rightElement));
 			} catch (final FactoryException e) {
 				toString = EMFCompareDiffMessages.getString("RemoteAddReferenceValueImpl.ToString", //$NON-NLS-1$
 						leftTarget.eClass().getName(), reference.getName(), rightElement.eClass().getName());
 			}
 		} else {
 			try {
-				toString = EMFCompareDiffMessages.getString("RemoveReferenceValueImpl.ToString", //$NON-NLS-1$
-						NameSimilarity.findName(leftTarget), reference.getName(), NameSimilarity
-								.findName(rightElement));
+				toString = EMFCompareDiffMessages.getString(
+						"RemoveReferenceValueImpl.ToString", //$NON-NLS-1$
+						NameSimilarity.findName(leftTarget), reference.getName(),
+						NameSimilarity.findName(rightElement));
 			} catch (final FactoryException e) {
 				toString = EMFCompareDiffMessages.getString("RemoveReferenceValueImpl.ToString", leftTarget //$NON-NLS-1$
 						.eClass().getName(), reference.getName(), rightElement.eClass().getName());
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/UpdateAttributeImpl.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/UpdateAttributeImpl.java
index 7b23b1431..3b6eb7d4d 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/UpdateAttributeImpl.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/UpdateAttributeImpl.java
@@ -46,19 +46,21 @@ public class UpdateAttributeImpl extends AttributeChangeImpl implements UpdateAt
 		String toString = null;
 		if (isRemote()) {
 			try {
-				toString = EMFCompareDiffMessages.getString("RemoteUpdateAttributeImpl.ToString", //$NON-NLS-1$
-						NameSimilarity.findName(attribute), NameSimilarity.findName(leftElement), leftElement
-								.eGet(attribute), rightElement.eGet(attribute));
+				toString = EMFCompareDiffMessages.getString(
+						"RemoteUpdateAttributeImpl.ToString", //$NON-NLS-1$
+						NameSimilarity.findName(attribute), NameSimilarity.findName(leftElement),
+						leftElement.eGet(attribute), rightElement.eGet(attribute));
 			} catch (final FactoryException e) {
-				toString = EMFCompareDiffMessages.getString("RemoteUpdateAttributeImpl.ToString", //$NON-NLS-1$
-						attribute.eClass().getName(), leftElement.eClass().getName(), leftElement
-								.eGet(attribute), rightElement.eGet(attribute));
+				toString = EMFCompareDiffMessages.getString(
+						"RemoteUpdateAttributeImpl.ToString", //$NON-NLS-1$
+						attribute.eClass().getName(), leftElement.eClass().getName(),
+						leftElement.eGet(attribute), rightElement.eGet(attribute));
 			}
 		} else {
 			try {
 				toString = EMFCompareDiffMessages.getString("UpdateAttributeImpl.ToString", NameSimilarity //$NON-NLS-1$
-						.findName(attribute), NameSimilarity.findName(leftElement), rightElement
-						.eGet(attribute), leftElement.eGet(attribute));
+						.findName(attribute), NameSimilarity.findName(leftElement),
+						rightElement.eGet(attribute), leftElement.eGet(attribute));
 			} catch (final FactoryException e) {
 				toString = EMFCompareDiffMessages.getString("UpdateAttributeImpl.ToString", attribute //$NON-NLS-1$
 						.eClass().getName(), leftElement.eClass().getName(), rightElement.eGet(attribute),
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/UpdateReferenceImpl.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/UpdateReferenceImpl.java
index ae380fa23..1c894ce1c 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/UpdateReferenceImpl.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/impl/UpdateReferenceImpl.java
@@ -226,9 +226,10 @@ public class UpdateReferenceImpl extends ReferenceChangeImpl implements UpdateRe
 		String toString = null;
 		if (isRemote()) {
 			try {
-				toString = EMFCompareDiffMessages.getString("RemoteUpdateReferenceImpl.ToString", //$NON-NLS-1$
-						reference.getName(), NameSimilarity.findName(leftElement), leftElement
-								.eGet(reference), rightElement.eGet(reference));
+				toString = EMFCompareDiffMessages.getString(
+						"RemoteUpdateReferenceImpl.ToString", //$NON-NLS-1$
+						reference.getName(), NameSimilarity.findName(leftElement),
+						leftElement.eGet(reference), rightElement.eGet(reference));
 			} catch (final FactoryException e) {
 				toString = EMFCompareDiffMessages.getString(
 						"RemoteUpdateReferenceImpl.ToString", //$NON-NLS-1$
@@ -237,9 +238,10 @@ public class UpdateReferenceImpl extends ReferenceChangeImpl implements UpdateRe
 			}
 		} else {
 			try {
-				toString = EMFCompareDiffMessages.getString("UpdateReferenceImpl.ToString", //$NON-NLS-1$
-						reference.getName(), NameSimilarity.findName(leftElement), rightElement
-								.eGet(reference), leftElement.eGet(reference));
+				toString = EMFCompareDiffMessages.getString(
+						"UpdateReferenceImpl.ToString", //$NON-NLS-1$
+						reference.getName(), NameSimilarity.findName(leftElement),
+						rightElement.eGet(reference), leftElement.eGet(reference));
 			} catch (final FactoryException e) {
 				toString = EMFCompareDiffMessages.getString(
 						"UpdateReferenceImpl.ToString", //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/util/DiffAdapterFactory.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/util/DiffAdapterFactory.java
index a6b27d73a..35b9afd4a 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/util/DiffAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/util/DiffAdapterFactory.java
@@ -153,6 +153,11 @@ public class DiffAdapterFactory extends AdapterFactoryImpl {
 		}
 
 		@Override
+		public Adapter caseAttributeOrderChange(AttributeOrderChange object) {
+			return createAttributeOrderChangeAdapter();
+		}
+
+		@Override
 		public Adapter caseUpdateAttribute(UpdateAttribute object) {
 			return createUpdateAttributeAdapter();
 		}
@@ -371,6 +376,21 @@ public class DiffAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.diff.metamodel.AttributeOrderChange <em>Attribute Order Change</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.AttributeOrderChange
+	 * @generated
+	 * @since 1.3
+	 */
+	public Adapter createAttributeOrderChangeAdapter() {
+		return null;
+	}
+
+	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.compare.diff.metamodel.ConflictingDiffElement <em>Conflicting Diff Element</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 -->
diff --git a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/util/DiffSwitch.java b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/util/DiffSwitch.java
index 7c049f4ea..d7092616f 100644
--- a/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/util/DiffSwitch.java
+++ b/plugins/org.eclipse.emf.compare.diff/src/org/eclipse/emf/compare/diff/metamodel/util/DiffSwitch.java
@@ -185,6 +185,22 @@ public class DiffSwitch<T> {
 	}
 
 	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Attribute Order Change</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Attribute Order Change</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 * @since 1.3
+	 */
+	public T caseAttributeOrderChange(AttributeOrderChange object) {
+		return null;
+	}
+
+	/**
 	 * Returns the result of interpreting the object as an instance of '<em>Conflicting Diff Element</em>'.
 	 * <!-- begin-user-doc --> This implementation returns null; returning a non-null result will terminate
 	 * the switch. <!-- end-user-doc -->
@@ -694,6 +710,17 @@ public class DiffSwitch<T> {
 					result = defaultCase(theEObject);
 				return result;
 			}
+			case DiffPackage.ATTRIBUTE_ORDER_CHANGE: {
+				AttributeOrderChange attributeOrderChange = (AttributeOrderChange)theEObject;
+				T result = caseAttributeOrderChange(attributeOrderChange);
+				if (result == null)
+					result = caseAttributeChange(attributeOrderChange);
+				if (result == null)
+					result = caseDiffElement(attributeOrderChange);
+				if (result == null)
+					result = defaultCase(theEObject);
+				return result;
+			}
 			case DiffPackage.UPDATE_ATTRIBUTE: {
 				UpdateAttribute updateAttribute = (UpdateAttribute)theEObject;
 				T result = caseUpdateAttribute(updateAttribute);