re-gen with support of font and color provider

17 files changed, 59 insertions, 95 deletions

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/AssociationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/AssociationChangeItemProvider.java
index c57ef9ef2..5aa16bf75 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/AssociationChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/AssociationChangeItemProvider.java
@@ -24,6 +24,8 @@ import org.eclipse.emf.compare.uml2.UMLComparePackage;
 

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

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

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

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

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

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

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

@@ -39,11 +41,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class AssociationChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

@@ -70,14 +68,14 @@ public class AssociationChangeItemProvider
 	}

 

 	/**

-	 * This returns AssociationChangeSpec.gif.

+	 * This returns AssociationChange.gif.

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

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

 	 * @generated

 	 */

 	@Override

 	public Object getImage(Object object) {

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

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

 	}

 

 	/**

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/DependencyChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/DependencyChangeItemProvider.java
index 09bfd71d0..8dc4f7aa4 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/DependencyChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/DependencyChangeItemProvider.java
@@ -24,6 +24,8 @@ import org.eclipse.emf.compare.uml2.UMLComparePackage;
 

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

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

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

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

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

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

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

@@ -39,11 +41,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class DependencyChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ExecutionSpecificationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ExecutionSpecificationChangeItemProvider.java
index fbff89e43..7cbfb0b3d 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ExecutionSpecificationChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ExecutionSpecificationChangeItemProvider.java
@@ -22,6 +22,8 @@ import org.eclipse.emf.compare.DifferenceKind;
 import org.eclipse.emf.compare.uml2.ExecutionSpecificationChange;

 

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

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

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

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

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

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

@@ -37,11 +39,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class ExecutionSpecificationChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ExtendChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ExtendChangeItemProvider.java
index e7cf3a8e6..d274e1287 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ExtendChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ExtendChangeItemProvider.java
@@ -24,6 +24,8 @@ import org.eclipse.emf.compare.uml2.UMLComparePackage;
 

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

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

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

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

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

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

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

@@ -39,11 +41,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class ExtendChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/GeneralizationSetChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/GeneralizationSetChangeItemProvider.java
index d28cf61b3..9d2e39d27 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/GeneralizationSetChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/GeneralizationSetChangeItemProvider.java
@@ -24,6 +24,8 @@ import org.eclipse.emf.compare.uml2.UMLComparePackage;
 

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

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

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

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

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

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

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

@@ -39,11 +41,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class GeneralizationSetChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/IncludeChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/IncludeChangeItemProvider.java
index 98d8d294e..07dea52b9 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/IncludeChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/IncludeChangeItemProvider.java
@@ -22,6 +22,8 @@ import org.eclipse.emf.compare.DifferenceKind;
 import org.eclipse.emf.compare.uml2.IncludeChange;

 

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

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

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

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

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

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

@@ -37,11 +39,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class IncludeChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/InterfaceRealizationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/InterfaceRealizationChangeItemProvider.java
index a5ef4da2d..b4a3f5ff8 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/InterfaceRealizationChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/InterfaceRealizationChangeItemProvider.java
@@ -22,6 +22,8 @@ import org.eclipse.emf.compare.DifferenceKind;
 import org.eclipse.emf.compare.uml2.InterfaceRealizationChange;

 

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

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

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

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

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

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

@@ -37,11 +39,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class InterfaceRealizationChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/IntervalConstraintChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/IntervalConstraintChangeItemProvider.java
index f343b495e..9327eeee2 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/IntervalConstraintChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/IntervalConstraintChangeItemProvider.java
@@ -22,6 +22,8 @@ import org.eclipse.emf.compare.DifferenceKind;
 import org.eclipse.emf.compare.uml2.IntervalConstraintChange;

 

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

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

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

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

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

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

@@ -37,11 +39,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class IntervalConstraintChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/MessageChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/MessageChangeItemProvider.java
index 2b104eb1d..540b9e427 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/MessageChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/MessageChangeItemProvider.java
@@ -22,6 +22,8 @@ import org.eclipse.emf.compare.DifferenceKind;
 import org.eclipse.emf.compare.uml2.MessageChange;

 

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

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

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

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

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

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

@@ -37,11 +39,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class MessageChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ProfileApplicationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ProfileApplicationChangeItemProvider.java
index 3f34bb1f1..f3e45200c 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ProfileApplicationChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/ProfileApplicationChangeItemProvider.java
@@ -28,6 +28,8 @@ import org.eclipse.emf.compare.uml2.UMLComparePackage;
 

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

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

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

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

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

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

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

@@ -43,11 +45,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class ProfileApplicationChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypeApplicationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypeApplicationChangeItemProvider.java
index 9ca95c488..641a72e2d 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypeApplicationChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypeApplicationChangeItemProvider.java
@@ -28,6 +28,8 @@ import org.eclipse.emf.compare.uml2.UMLComparePackage;
 

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

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

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

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

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

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

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

@@ -43,11 +45,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class StereotypeApplicationChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypePropertyChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypePropertyChangeItemProvider.java
index 0e5c7fec8..fb3e53231 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypePropertyChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypePropertyChangeItemProvider.java
@@ -24,6 +24,8 @@ import org.eclipse.emf.compare.uml2.UMLComparePackage;
 

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

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

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

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

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

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

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

@@ -39,11 +41,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class StereotypePropertyChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypeReferenceChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypeReferenceChangeItemProvider.java
index 83b592e2e..b007c7652 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypeReferenceChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/StereotypeReferenceChangeItemProvider.java
@@ -22,6 +22,8 @@ import org.eclipse.emf.compare.DifferenceKind;
 import org.eclipse.emf.compare.uml2.StereotypeReferenceChange;

 

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

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

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

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

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

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

@@ -37,11 +39,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class StereotypeReferenceChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/SubstitutionChangeItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/SubstitutionChangeItemProvider.java
index 7df5cfd8b..7640865c3 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/SubstitutionChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/SubstitutionChangeItemProvider.java
@@ -22,6 +22,8 @@ import org.eclipse.emf.compare.DifferenceKind;
 import org.eclipse.emf.compare.uml2.SubstitutionChange;

 

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

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

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

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

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

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

@@ -37,11 +39,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class SubstitutionChangeItemProvider

 	extends UMLDiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLCompareItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLCompareItemProviderAdapterFactory.java
index 5d8658a01..374adf2e4 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLCompareItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLCompareItemProviderAdapterFactory.java
@@ -25,6 +25,8 @@ import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.IChangeNotifier;

 import org.eclipse.emf.edit.provider.IDisposable;

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

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

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

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

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

 import org.eclipse.emf.edit.provider.INotifyChangedListener;

@@ -77,6 +79,8 @@ public class UMLCompareItemProviderAdapterFactory extends UMLCompareAdapterFacto
 		supportedTypes.add(ITreeItemContentProvider.class);

 		supportedTypes.add(IItemLabelProvider.class);

 		supportedTypes.add(IItemPropertySource.class);

+		supportedTypes.add(IItemColorProvider.class);

+		supportedTypes.add(IItemFontProvider.class);

 	}

 

 	/**

diff --git a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLDiffItemProvider.java b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLDiffItemProvider.java
index 076e96ae9..cc4105021 100644
--- a/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLDiffItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.uml2.edit/src-gen/org/eclipse/emf/compare/uml2/provider/UMLDiffItemProvider.java
@@ -28,6 +28,8 @@ import org.eclipse.emf.compare.uml2.UMLDiff;
 

 import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;

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

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

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

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

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

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

@@ -43,11 +45,7 @@ import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 public class UMLDiffItemProvider

 	extends DiffItemProvider

 	implements

-		IEditingDomainItemProvider,

-		IStructuredItemContentProvider,

-		ITreeItemContentProvider,

-		IItemLabelProvider,

-		IItemPropertySource {

+		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {

 	/**

 	 * This constructs an instance from a factory and a notifier.

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

diff --git a/plugins/org.eclipse.emf.compare.uml2/model/uml2diff.genmodel b/plugins/org.eclipse.emf.compare.uml2/model/uml2diff.genmodel
index 659ec7dfe..34c4f24f3 100644
--- a/plugins/org.eclipse.emf.compare.uml2/model/uml2diff.genmodel
+++ b/plugins/org.eclipse.emf.compare.uml2/model/uml2diff.genmodel
@@ -6,30 +6,18 @@
     modelPluginID="org.eclipse.emf.compare.uml2" modelName="Uml2" editPluginClass="org.eclipse.emf.compare.uml2.provider.UMLCompareEditPlugin"
     nonNLSMarkers="true" testSuiteClass="org.eclipse.emf.compare.uml2diff.tests.UML2DiffAllTests"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    usedGenPackages="platform:/plugin/org.eclipse.emf.compare/model/compare.genmodel#//compare platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
+    colorProviders="true" fontProviders="true" usedGenPackages="platform:/plugin/org.eclipse.emf.compare/model/compare.genmodel#//compare platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml platform:/plugin/org.eclipse.uml2.types/model/Types.genmodel#//types">
   <foreignModel>uml2diff.ecore</foreignModel>
   <genPackages xsi:type="genmodel:GenPackage" prefix="UMLCompare" basePackage="org.eclipse.emf.compare"
       disposableProviderFactory="true" ecorePackage="uml2diff.ecore#/">
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//AssociationChange">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference uml2diff.ecore#//AssociationChange/association"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//DependencyChange">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference uml2diff.ecore#//DependencyChange/dependency"/>
-    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//AssociationChange"/>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//DependencyChange"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//InterfaceRealizationChange"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//SubstitutionChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//ExtendChange">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference uml2diff.ecore#//ExtendChange/extend"/>
-    </genClasses>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//GeneralizationSetChange">
-      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
-          propertySortChoices="true" ecoreFeature="ecore:EReference uml2diff.ecore#//GeneralizationSetChange/generalizationSet"/>
-    </genClasses>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//ExtendChange"/>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//IncludeChange"/>
+    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//GeneralizationSetChange"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//ExecutionSpecificationChange"/>
-    <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//DestructionEventChange"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//IntervalConstraintChange"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//MessageChange"/>
     <genClasses xsi:type="genmodel:GenClass" ecoreClass="uml2diff.ecore#//StereotypePropertyChange">
@@ -48,6 +36,8 @@
     <genClasses xsi:type="genmodel:GenClass" image="false" ecoreClass="uml2diff.ecore#//UMLDiff">
       <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
           propertySortChoices="true" ecoreFeature="ecore:EReference uml2diff.ecore#//UMLDiff/discriminant"/>
+      <genFeatures xsi:type="genmodel:GenFeature" notify="false" createChild="false"
+          propertySortChoices="true" ecoreFeature="ecore:EReference uml2diff.ecore#//UMLDiff/eReference"/>
     </genClasses>
   </genPackages>
 </genmodel:GenModel>