Name refactoring.

Remove engine references for genric objects.




Change-Id: I4a299b5c6fdfb1a4bc0ab9691e62ea0c8c3f0684
Signed-off-by: Arthur Daussy <arthur.daussy@obeo.fr>

17 files changed, 114 insertions, 116 deletions

diff --git a/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF
index f181a0710..46ca81332 100644
--- a/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.rcp/META-INF/MANIFEST.MF
@@ -14,8 +14,8 @@ Bundle-Localization: plugin
 Export-Package: org.eclipse.emf.compare.rcp,
  org.eclipse.emf.compare.rcp.extension,
  org.eclipse.emf.compare.rcp.internal;x-internal:=true,
- org.eclipse.emf.compare.rcp.internal.engine;x-friends:="org.eclipse.emf.compare.rcp.ui,org.eclipse.emf.compare.ide.ui",
- org.eclipse.emf.compare.rcp.internal.engine.impl;x-friends:="org.eclipse.emf.compare.rcp.ui,org.eclipse.emf.compare.ide.ui",
+ org.eclipse.emf.compare.rcp.internal.extension;x-friends:="org.eclipse.emf.compare.rcp.ui,org.eclipse.emf.compare.ide.ui",
+ org.eclipse.emf.compare.rcp.internal.extension.impl;x-friends:="org.eclipse.emf.compare.rcp.ui,org.eclipse.emf.compare.ide.ui",
  org.eclipse.emf.compare.rcp.internal.match;x-friends:="org.eclipse.emf.compare.rcp.ui",
  org.eclipse.emf.compare.rcp.internal.merger;x-internal:=true,
  org.eclipse.emf.compare.rcp.internal.policy;x-internal:=true,
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/EMFCompareRCPPlugin.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/EMFCompareRCPPlugin.java
index 9988c6c3f..b14dda193 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/EMFCompareRCPPlugin.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/EMFCompareRCPPlugin.java
@@ -28,9 +28,9 @@ import org.eclipse.emf.compare.postprocessor.PostProcessorDescriptorRegistryImpl
 import org.eclipse.emf.compare.provider.EMFCompareEditPlugin;
 import org.eclipse.emf.compare.rcp.extension.AbstractRegistryEventListener;
 import org.eclipse.emf.compare.rcp.internal.adapterfactory.AdapterFactoryDescriptorRegistryListener;
-import org.eclipse.emf.compare.rcp.internal.engine.IItemRegistry;
-import org.eclipse.emf.compare.rcp.internal.engine.impl.DescriptorRegistryEventListener;
-import org.eclipse.emf.compare.rcp.internal.engine.impl.EngineRegistry;
+import org.eclipse.emf.compare.rcp.internal.extension.IItemRegistry;
+import org.eclipse.emf.compare.rcp.internal.extension.impl.DescriptorRegistryEventListener;
+import org.eclipse.emf.compare.rcp.internal.extension.impl.ItemRegistry;
 import org.eclipse.emf.compare.rcp.internal.match.MatchEngineFactoryRegistryListener;
 import org.eclipse.emf.compare.rcp.internal.match.MatchEnginefactoryRegistryWrapper;
 import org.eclipse.emf.compare.rcp.internal.merger.MergerExtensionRegistryListener;
@@ -86,16 +86,16 @@ public class EMFCompareRCPPlugin extends Plugin {
 	private IMerger.Registry mergerRegistry;
 
 	/** The registry that will hold references to all differences engines. */
-	private EngineRegistry<IDiffEngine> diffEngineRegistry;
+	private ItemRegistry<IDiffEngine> diffEngineRegistry;
 
 	/** The registry that will hold references to all equivalences engines. */
-	private EngineRegistry<IEquiEngine> equiEngineRegistry;
+	private ItemRegistry<IEquiEngine> equiEngineRegistry;
 
 	/** The registry that will hold references to all requirements engines. */
-	private EngineRegistry<IReqEngine> reqEngineRegistry;
+	private ItemRegistry<IReqEngine> reqEngineRegistry;
 
 	/** The registry that will hold references to all conflicts detector. */
-	private EngineRegistry<IConflictDetector> conflictDetectorRegistry;
+	private ItemRegistry<IConflictDetector> conflictDetectorRegistry;
 
 	/** The registry listener that will be used to react to merger changes. */
 	private AbstractRegistryEventListener mergerRegistryListener;
@@ -196,7 +196,7 @@ public class EMFCompareRCPPlugin extends Plugin {
 	 *            {@link IExtensionRegistry} to listen in order to fill the registry
 	 */
 	private void setUpMatchEngineFactoryRegistry(final IExtensionRegistry registry) {
-		matchEngineFactoryRegistry = new EngineRegistry<IMatchEngine.Factory>();
+		matchEngineFactoryRegistry = new ItemRegistry<IMatchEngine.Factory>();
 		matchEngineFactoryRegistryListener = new MatchEngineFactoryRegistryListener(PLUGIN_ID,
 				MATCH_ENGINE_PPID, getLog(), matchEngineFactoryRegistry);
 		matchEngineFactoryRegistryListener.readRegistry(registry);
@@ -252,7 +252,7 @@ public class EMFCompareRCPPlugin extends Plugin {
 	 *            {@link IExtensionRegistry} to listen in order to fill the registry
 	 */
 	private void setUpDiffEngineRegistry(final IExtensionRegistry registry) {
-		diffEngineRegistry = new EngineRegistry<IDiffEngine>();
+		diffEngineRegistry = new ItemRegistry<IDiffEngine>();
 		diffEngineListener = new DescriptorRegistryEventListener<IDiffEngine>(PLUGIN_ID, DIFF_ENGINE_PPID,
 				getLog(), diffEngineRegistry);
 		registry.addListener(diffEngineListener);
@@ -266,7 +266,7 @@ public class EMFCompareRCPPlugin extends Plugin {
 	 *            {@link IExtensionRegistry} to listen in order to fill the registry
 	 */
 	private void setUpEquiEngineRegistry(final IExtensionRegistry registry) {
-		equiEngineRegistry = new EngineRegistry<IEquiEngine>();
+		equiEngineRegistry = new ItemRegistry<IEquiEngine>();
 		equiEngineListener = new DescriptorRegistryEventListener<IEquiEngine>(PLUGIN_ID, EQUI_ENGINE_PPID,
 				getLog(), equiEngineRegistry);
 		registry.addListener(equiEngineListener);
@@ -280,7 +280,7 @@ public class EMFCompareRCPPlugin extends Plugin {
 	 *            {@link IExtensionRegistry} to listen in order to fill the registry
 	 */
 	private void setUpReqEngineRegistry(final IExtensionRegistry registry) {
-		reqEngineRegistry = new EngineRegistry<IReqEngine>();
+		reqEngineRegistry = new ItemRegistry<IReqEngine>();
 		reqEngineListener = new DescriptorRegistryEventListener<IReqEngine>(PLUGIN_ID, REQ_ENGINE_PPID,
 				getLog(), reqEngineRegistry);
 		registry.addListener(reqEngineListener);
@@ -294,7 +294,7 @@ public class EMFCompareRCPPlugin extends Plugin {
 	 *            {@link IExtensionRegistry} to listen in order to fill the registry
 	 */
 	private void setUpConflictDetectorRegistry(final IExtensionRegistry registry) {
-		conflictDetectorRegistry = new EngineRegistry<IConflictDetector>();
+		conflictDetectorRegistry = new ItemRegistry<IConflictDetector>();
 		conflictDetectorListener = new DescriptorRegistryEventListener<IConflictDetector>(PLUGIN_ID,
 				CONFLICT_DETECTOR_PPID, getLog(), conflictDetectorRegistry);
 		registry.addListener(conflictDetectorListener);
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/IConfigurableItem.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/IConfigurableItem.java
index 1befb5e40..c6aec102a 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/IConfigurableItem.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/IConfigurableItem.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.rcp.internal.engine;

+package org.eclipse.emf.compare.rcp.internal.extension;

 

 import org.osgi.service.prefs.Preferences;

 

diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/IEMFCompareBuilderConfigurator.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/IEMFCompareBuilderConfigurator.java
index f00b61dd5..c12d74753 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/IEMFCompareBuilderConfigurator.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/IEMFCompareBuilderConfigurator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.rcp.internal.engine;
+package org.eclipse.emf.compare.rcp.internal.extension;
 
 import org.eclipse.emf.compare.EMFCompare.Builder;
 
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/IItemDescriptor.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/IItemDescriptor.java
index 1ed359d4d..85b57144a 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/IItemDescriptor.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/IItemDescriptor.java
@@ -8,40 +8,40 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.rcp.internal.engine;
+package org.eclipse.emf.compare.rcp.internal.extension;
 
 /**
- * An engine descriptor.
+ * An item descriptor.
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  * @param <T>
- *            one of the engine
+ *            one of the item
  */
 public interface IItemDescriptor<T> extends Comparable<IItemDescriptor<T>> {
 
 	/**
-	 * The label of the engine.
+	 * The label of the item.
 	 * 
-	 * @return label of the engine
+	 * @return label of the item
 	 */
 	String getLabel();
 
 	/**
-	 * The description of the engine.
+	 * The description of the item.
 	 * 
-	 * @return description of the engine
+	 * @return description of the item
 	 */
 	String getDescription();
 
 	/**
-	 * Rank of the engine.
+	 * Rank of the item.
 	 * 
 	 * @return rank
 	 */
 	int getRank();
 
 	/**
-	 * Get a unique key identifying this engine.
+	 * Get a unique key identifying this item.
 	 * 
 	 * @return a key
 	 */
@@ -50,7 +50,7 @@ public interface IItemDescriptor<T> extends Comparable<IItemDescriptor<T>> {
 	/**
 	 * Get an instance of an item.
 	 * 
-	 * @return an instance of an engine
+	 * @return an instance of an item
 	 */
 	T getItem();
 }
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/IItemRegistry.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/IItemRegistry.java
index 57d7affe5..499c8017d 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/IItemRegistry.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/IItemRegistry.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.rcp.internal.engine;
+package org.eclipse.emf.compare.rcp.internal.extension;
 
 import java.util.List;
 
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/AbstractItemDescriptor.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/AbstractItemDescriptor.java
index c2354323a..03a226137 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/AbstractItemDescriptor.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/AbstractItemDescriptor.java
@@ -8,12 +8,12 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.rcp.internal.engine.impl;

+package org.eclipse.emf.compare.rcp.internal.extension.impl;

 

 import com.google.common.base.Function;

 import com.google.common.base.Preconditions;

 

-import org.eclipse.emf.compare.rcp.internal.engine.IItemDescriptor;

+import org.eclipse.emf.compare.rcp.internal.extension.IItemDescriptor;

 

 /**

  * Abstract class for an {@link IItemDescriptor}.

@@ -27,16 +27,16 @@ public abstract class AbstractItemDescriptor<T> implements IItemDescriptor<T> {
 	/** EMPTY_STRING. */

 	protected static final String EMPTY_STRING = ""; //$NON-NLS-1$

 

-	/** Label of the engine. */

+	/** Label of the item. */

 	private final String label;

 

-	/** Description of the engine. */

+	/** Description of the item. */

 	private final String description;

 

-	/** Rank of the engine. */

+	/** Rank of the item. */

 	private final int rank;

 

-	/** ID of the engine (Use as key for the registry). */

+	/** ID of the item (Use as key for the registry). */

 	private final String id;

 

 	/**

diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/DescriptorRegistryEventListener.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/DescriptorRegistryEventListener.java
index 76af1f2cc..1a53b6958 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/DescriptorRegistryEventListener.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/DescriptorRegistryEventListener.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.rcp.internal.engine.impl;
+package org.eclipse.emf.compare.rcp.internal.extension.impl;
 
 import org.eclipse.core.runtime.IConfigurationElement;
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.compare.rcp.extension.AbstractRegistryEventListener;
 import org.eclipse.emf.compare.rcp.internal.EMFCompareRCPMessages;
-import org.eclipse.emf.compare.rcp.internal.engine.IItemDescriptor;
-import org.eclipse.emf.compare.rcp.internal.engine.IItemRegistry;
+import org.eclipse.emf.compare.rcp.internal.extension.IItemDescriptor;
+import org.eclipse.emf.compare.rcp.internal.extension.IItemRegistry;
 
 /**
  * Base class for Descriptor Registry.
@@ -48,7 +48,7 @@ public class DescriptorRegistryEventListener<T> extends AbstractRegistryEventLis
 	/** EMPTY_STRING. */
 	private static final String EMPTY_STRING = ""; //$NON-NLS-1$
 
-	/** Registry of the engines. */
+	/** Registry of items. */
 	private final IItemRegistry<T> registry;
 
 	/**
@@ -62,7 +62,7 @@ public class DescriptorRegistryEventListener<T> extends AbstractRegistryEventLis
 	 *            Logger
 	 * @param registry
 	 *            {@link IItemRegistry} where
-	 *            {@link org.eclipse.emf.compare.rcp.internal.engine.IItemDescriptor} will be stored
+	 *            {@link org.eclipse.emf.compare.rcp.internal.extension.IItemDescriptor} will be stored
 	 */
 	public DescriptorRegistryEventListener(String namespace, String extensionPointID, ILog log,
 			IItemRegistry<T> registry) {
@@ -128,7 +128,7 @@ public class DescriptorRegistryEventListener<T> extends AbstractRegistryEventLis
 		String label = element.getAttribute(DescriptorRegistryEventListener.LABEL_DESCRIPTOR_ATTR);
 		String description = element.getAttribute(DESCRITPION_DESCRIPTOR_ATTR);
 		String id = element.getAttribute(ID_DESCRIPTOR_ATTR);
-		EngineDescriptor<T> descriptor = new EngineDescriptor<T>(label, description, rank, element, id);
+		ItemDescriptor<T> descriptor = new ItemDescriptor<T>(label, description, rank, element, id);
 		IItemDescriptor<T> previous = registry.add(descriptor);
 		if (previous != null) {
 			log(IStatus.WARNING, element, EMFCompareRCPMessages.getString(
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/EMFCompareBuilderConfigurator.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/EMFCompareBuilderConfigurator.java
index 4de0e530d..83cae3b41 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/EMFCompareBuilderConfigurator.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/EMFCompareBuilderConfigurator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.rcp.internal.engine.impl;
+package org.eclipse.emf.compare.rcp.internal.extension.impl;
 
 import com.google.common.base.Preconditions;
 
@@ -20,7 +20,7 @@ import org.eclipse.emf.compare.equi.IEquiEngine;
 import org.eclipse.emf.compare.match.IMatchEngine;
 import org.eclipse.emf.compare.match.IMatchEngine.Factory.Registry;
 import org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin;
-import org.eclipse.emf.compare.rcp.internal.engine.IEMFCompareBuilderConfigurator;
+import org.eclipse.emf.compare.rcp.internal.extension.IEMFCompareBuilderConfigurator;
 import org.eclipse.emf.compare.rcp.internal.preferences.EMFComparePreferences;
 import org.eclipse.emf.compare.req.IReqEngine;
 
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/FactoryDescriptor.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/FactoryDescriptor.java
index d9db7fe9a..10954af5d 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/FactoryDescriptor.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/FactoryDescriptor.java
@@ -8,8 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.rcp.internal.engine.impl;
-
+package org.eclipse.emf.compare.rcp.internal.extension.impl;
 
 /**
  * IItemDescriptor used for factories. The will be only one instance of each item.
@@ -27,13 +26,13 @@ public class FactoryDescriptor<T> extends AbstractItemDescriptor<T> {
 	 * Constructor.
 	 * 
 	 * @param label
-	 *            {@link EngineDescriptor#label}
+	 *            {@link ItemDescriptor#label}
 	 * @param description
-	 *            {@link EngineDescriptor#description}
+	 *            {@link ItemDescriptor#description}
 	 * @param rank
-	 *            {@link EngineDescriptor#rank}
+	 *            {@link ItemDescriptor#rank}
 	 * @param id
-	 *            {@link EngineDescriptor#id}
+	 *            {@link ItemDescriptor#id}
 	 * @param instance
 	 *            Instance of the factory
 	 */
@@ -43,9 +42,9 @@ public class FactoryDescriptor<T> extends AbstractItemDescriptor<T> {
 	}
 
 	/**
-	 * Create an engine.
+	 * Create an item.
 	 * 
-	 * @return a engine instance
+	 * @return a item instance
 	 */
 	public T getItem() {
 		return instance;
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/EngineDescriptor.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/ItemDescriptor.java
index 0c03e1458..3a6e4da7f 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/EngineDescriptor.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/ItemDescriptor.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.rcp.internal.engine.impl;
+package org.eclipse.emf.compare.rcp.internal.extension.impl;
 
 import com.google.common.base.Throwables;
 
@@ -16,39 +16,38 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;
 
 /**
- * Descriptor for an engine.
+ * Descriptor for an item.
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  * @param <T>
- *            one of the engine
+ *            an item type
  */
-public class EngineDescriptor<T> extends AbstractItemDescriptor<T> {
+public class ItemDescriptor<T> extends AbstractItemDescriptor<T> {
 
-	/** IConfig element of the engine. */
+	/** IConfig element of the item. */
 	private final IConfigurationElement config;
 
 	/**
 	 * Constructor.
 	 * 
 	 * @param label
-	 *            {@link EngineDescriptor#label}
+	 *            {@link ItemDescriptor#label}
 	 * @param description
-	 *            {@link EngineDescriptor#description}
+	 *            {@link ItemDescriptor#description}
 	 * @param rank
-	 *            {@link EngineDescriptor#rank}
+	 *            {@link ItemDescriptor#rank}
 	 * @param config
-	 *            {@link EngineDescriptor#config}
+	 *            {@link ItemDescriptor#config}
 	 * @param id
-	 *            {@link EngineDescriptor#id}
+	 *            {@link ItemDescriptor#id}
 	 */
-	public EngineDescriptor(String label, String description, int rank, IConfigurationElement config,
-			String id) {
+	public ItemDescriptor(String label, String description, int rank, IConfigurationElement config, String id) {
 		super(label, description, rank, id);
 		this.config = config;
 	}
 
 	/**
-	 * {@link EngineDescriptor#config}.
+	 * {@link ItemDescriptor#config}.
 	 * 
 	 * @return IConfigurationElement.
 	 */
@@ -57,9 +56,9 @@ public class EngineDescriptor<T> extends AbstractItemDescriptor<T> {
 	}
 
 	/**
-	 * Create an engine.
+	 * Create an item.
 	 * 
-	 * @return a engine instance
+	 * @return a item instance
 	 */
 	@SuppressWarnings("unchecked")
 	public T getItem() {
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/EngineRegistry.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/ItemRegistry.java
index 02dda85fa..264f9710a 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/EngineRegistry.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/ItemRegistry.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.rcp.internal.engine.impl;
+package org.eclipse.emf.compare.rcp.internal.extension.impl;
 
 import com.google.common.collect.Lists;
 
@@ -17,19 +17,19 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.eclipse.emf.compare.rcp.internal.engine.IItemDescriptor;
-import org.eclipse.emf.compare.rcp.internal.engine.IItemRegistry;
+import org.eclipse.emf.compare.rcp.internal.extension.IItemDescriptor;
+import org.eclipse.emf.compare.rcp.internal.extension.IItemRegistry;
 
 /**
  * Registry holding {@link IItemDescriptor}.
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  * @param <T>
- *            one of the engine class
+ *            one of the item class
  */
-public class EngineRegistry<T> implements IItemRegistry<T> {
+public class ItemRegistry<T> implements IItemRegistry<T> {
 
-	/** Registry of all engine. */
+	/** Item registry. */
 	private final Map<String, IItemDescriptor<T>> registry = new ConcurrentHashMap<String, IItemDescriptor<T>>();
 
 	/**
@@ -53,8 +53,8 @@ public class EngineRegistry<T> implements IItemRegistry<T> {
 	/**
 	 * {@inheritDoc}
 	 */
-	public IItemDescriptor<T> add(IItemDescriptor<T> engineDescriptor) {
-		return registry.put(engineDescriptor.getID(), engineDescriptor);
+	public IItemDescriptor<T> add(IItemDescriptor<T> itemDescriptor) {
+		return registry.put(itemDescriptor.getID(), itemDescriptor);
 
 	}
 
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/ItemUtil.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/ItemUtil.java
index a6e6c3c5f..1d8507e3d 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/engine/impl/ItemUtil.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/extension/impl/ItemUtil.java
@@ -8,15 +8,15 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.rcp.internal.engine.impl;
+package org.eclipse.emf.compare.rcp.internal.extension.impl;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin;
-import org.eclipse.emf.compare.rcp.internal.engine.IItemDescriptor;
-import org.eclipse.emf.compare.rcp.internal.engine.IItemRegistry;
+import org.eclipse.emf.compare.rcp.internal.extension.IItemDescriptor;
+import org.eclipse.emf.compare.rcp.internal.extension.IItemRegistry;
 import org.osgi.service.prefs.Preferences;
 
 /**
@@ -36,22 +36,22 @@ public final class ItemUtil {
 	}
 
 	/**
-	 * Get an engine using the preferences. If nothing has been set in the preferences then the highest
-	 * ranking engine is returned
+	 * Get an item using the preferences. If nothing has been set in the preferences then the highest ranking
+	 * item is returned
 	 * 
 	 * @param registry
-	 *            The engine registry
+	 *            The item registry
 	 * @param preferenceKey
 	 *            The preference to retrieve the key.
-	 * @param enginePreferences
-	 *            Eclipse preference where are stored the engines to use
+	 * @param itemPreferences
+	 *            Eclipse preference where are stored the items to use
 	 * @param <T>
-	 *            Type of engine
-	 * @return an engine or null if nothing has been found.
+	 *            Type of item
+	 * @return an item or null if nothing has been found.
 	 */
 	public static <T> T getItem(IItemRegistry<T> registry, String preferenceKey,
-			IEclipsePreferences enginePreferences) {
-		IItemDescriptor<T> desc = getDefaultItemDescriptor(registry, preferenceKey, enginePreferences);
+			IEclipsePreferences itemPreferences) {
+		IItemDescriptor<T> desc = getDefaultItemDescriptor(registry, preferenceKey, itemPreferences);
 		if (desc != null) {
 			return desc.getItem();
 		}
@@ -60,21 +60,21 @@ public final class ItemUtil {
 
 	/**
 	 * Get an item descriptor using the preferences. If nothing has been set in the preferences then the
-	 * highest ranking engine is returned
+	 * highest ranking item is returned
 	 * 
 	 * @param registry
-	 *            {@link IItemRegistry} of the engine type
+	 *            {@link IItemRegistry} of the item type
 	 * @param preferenceKey
-	 *            Preference key use to retrieve the engine
-	 * @param enginePreferences
-	 *            {@link IEclipsePreferences} where are stored the engine preferences.
+	 *            Preference key use to retrieve the item
+	 * @param itemPreferences
+	 *            {@link IEclipsePreferences} where are stored the item preferences.
 	 * @param <T>
-	 *            Type of engine
+	 *            Type of item
 	 * @return {@link IItemDescriptor}
 	 */
 	public static <T> IItemDescriptor<T> getDefaultItemDescriptor(IItemRegistry<T> registry,
-			String preferenceKey, IEclipsePreferences enginePreferences) {
-		IItemDescriptor<T> result = getItemDescriptorFromPref(registry, enginePreferences, preferenceKey);
+			String preferenceKey, IEclipsePreferences itemPreferences) {
+		IItemDescriptor<T> result = getItemDescriptorFromPref(registry, itemPreferences, preferenceKey);
 		if (result == null) {
 			IItemDescriptor<T> descriptor = registry.getHighestRankingDescriptor();
 			if (descriptor != null) {
@@ -91,18 +91,18 @@ public final class ItemUtil {
 	 *            Registry for the {@link IItemDescriptor}
 	 * @param preferenceKey
 	 *            Key for this {@link IItemDescriptor} in preferences
-	 * @param enginePreferences
+	 * @param itemPreferences
 	 *            {@link IEclipsePreferences} where are stored {@link IItemDescriptor} values
 	 * @param <T>
 	 *            Type of {@link IItemDescriptor}
 	 * @return {@link IItemDescriptor} or null if nothing in preferences
 	 */
 	private static <T> IItemDescriptor<T> getItemDescriptorFromPref(IItemRegistry<T> registry,
-			IEclipsePreferences enginePreferences, String preferenceKey) {
-		String engineKey = enginePreferences.get(preferenceKey, null);
+			IEclipsePreferences itemPreferences, String preferenceKey) {
+		String itemKey = itemPreferences.get(preferenceKey, null);
 		IItemDescriptor<T> result = null;
-		if (engineKey != null) {
-			IItemDescriptor<T> descritpor = registry.getItemDescriptor(engineKey);
+		if (itemKey != null) {
+			IItemDescriptor<T> descritpor = registry.getItemDescriptor(itemKey);
 			if (descritpor != null) {
 				result = descritpor;
 			}
@@ -117,15 +117,15 @@ public final class ItemUtil {
 	 *            Registry for the {@link IItemDescriptor}
 	 * @param preferenceKey
 	 *            Key for this {@link IItemDescriptor} in preferences
-	 * @param enginePreferences
+	 * @param itemPreferences
 	 *            {@link IEclipsePreferences} where are stored {@link IItemDescriptor} values
 	 * @param <T>
 	 *            Type of {@link IItemDescriptor}
 	 * @return List of {@link IItemDescriptor} or null if nothing in preferences
 	 */
 	public static <T> List<IItemDescriptor<T>> getItemsDescriptor(IItemRegistry<T> registry,
-			String preferenceKey, IEclipsePreferences enginePreferences) {
-		String diffEngineKey = enginePreferences.get(preferenceKey, null);
+			String preferenceKey, IEclipsePreferences itemPreferences) {
+		String diffEngineKey = itemPreferences.get(preferenceKey, null);
 		List<IItemDescriptor<T>> result = null;
 		if (diffEngineKey != null) {
 			String[] diffEngineKeys = diffEngineKey.split(PREFFERENCE_DELIMITER);
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/DefaultRCPMatchEngineFactory.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/DefaultRCPMatchEngineFactory.java
index 47e62fbc1..464aa54d3 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/DefaultRCPMatchEngineFactory.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/DefaultRCPMatchEngineFactory.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.compare.EMFCompareMessages;
 import org.eclipse.emf.compare.match.DefaultMatchEngine;

 import org.eclipse.emf.compare.match.IMatchEngine;

 import org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin;

-import org.eclipse.emf.compare.rcp.internal.engine.IConfigurableItem;

+import org.eclipse.emf.compare.rcp.internal.extension.IConfigurableItem;

 import org.eclipse.emf.compare.scope.IComparisonScope;

 import org.eclipse.emf.compare.utils.UseIdentifiers;

 import org.osgi.service.prefs.Preferences;

diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEngineFactoryDescriptor.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEngineFactoryDescriptor.java
index 1d482ce9f..2f4ceb637 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEngineFactoryDescriptor.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEngineFactoryDescriptor.java
@@ -16,9 +16,9 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IConfigurationElement;

 import org.eclipse.emf.compare.match.IMatchEngine;

 import org.eclipse.emf.compare.match.IMatchEngine.Factory;

-import org.eclipse.emf.compare.rcp.internal.engine.IConfigurableItem;

-import org.eclipse.emf.compare.rcp.internal.engine.impl.EngineDescriptor;

-import org.eclipse.emf.compare.rcp.internal.engine.impl.ItemUtil;

+import org.eclipse.emf.compare.rcp.internal.extension.IConfigurableItem;

+import org.eclipse.emf.compare.rcp.internal.extension.impl.ItemDescriptor;

+import org.eclipse.emf.compare.rcp.internal.extension.impl.ItemUtil;

 import org.eclipse.emf.compare.rcp.internal.preferences.EMFComparePreferences;

 import org.osgi.service.prefs.Preferences;

 

@@ -27,21 +27,21 @@ import org.osgi.service.prefs.Preferences;
  * 

  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>

  */

-public class MatchEngineFactoryDescriptor extends EngineDescriptor<IMatchEngine.Factory> {

+public class MatchEngineFactoryDescriptor extends ItemDescriptor<IMatchEngine.Factory> {

 

 	/**

 	 * Constructor.

 	 * 

 	 * @param label

-	 *            {@link EngineDescriptor#getLabel()}

+	 *            {@link ItemDescriptor#getLabel()}

 	 * @param description

-	 *            {@link EngineDescriptor#getDescription()}

+	 *            {@link ItemDescriptor#getDescription()}

 	 * @param rank

-	 *            {@link EngineDescriptor#getRank()}

+	 *            {@link ItemDescriptor#getRank()}

 	 * @param config

 	 *            {@link IConfigurableItem} element used to create this item.

 	 * @param id

-	 *            {@link EngineDescriptor#getID()}

+	 *            {@link ItemDescriptor#getID()}

 	 */

 	public MatchEngineFactoryDescriptor(String label, String description, int rank,

 			IConfigurationElement config, String id) {

diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEngineFactoryRegistryListener.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEngineFactoryRegistryListener.java
index b1647d2cb..dcb518b28 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEngineFactoryRegistryListener.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEngineFactoryRegistryListener.java
@@ -16,8 +16,8 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.emf.compare.match.IMatchEngine;
 import org.eclipse.emf.compare.rcp.extension.AbstractRegistryEventListener;
 import org.eclipse.emf.compare.rcp.internal.EMFCompareRCPMessages;
-import org.eclipse.emf.compare.rcp.internal.engine.IItemDescriptor;
-import org.eclipse.emf.compare.rcp.internal.engine.IItemRegistry;
+import org.eclipse.emf.compare.rcp.internal.extension.IItemDescriptor;
+import org.eclipse.emf.compare.rcp.internal.extension.IItemRegistry;
 
 /**
  * Listener for contributions to the match engine extension.
diff --git a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEnginefactoryRegistryWrapper.java b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEnginefactoryRegistryWrapper.java
index 6747ed3e7..aefd17af5 100644
--- a/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEnginefactoryRegistryWrapper.java
+++ b/plugins/org.eclipse.emf.compare.rcp/src/org/eclipse/emf/compare/rcp/internal/match/MatchEnginefactoryRegistryWrapper.java
@@ -27,11 +27,11 @@ import java.util.List;
 import org.eclipse.emf.compare.match.IMatchEngine;
 import org.eclipse.emf.compare.match.IMatchEngine.Factory;
 import org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin;
-import org.eclipse.emf.compare.rcp.internal.engine.IItemDescriptor;
-import org.eclipse.emf.compare.rcp.internal.engine.IItemRegistry;
-import org.eclipse.emf.compare.rcp.internal.engine.impl.AbstractItemDescriptor;
-import org.eclipse.emf.compare.rcp.internal.engine.impl.FactoryDescriptor;
-import org.eclipse.emf.compare.rcp.internal.engine.impl.ItemUtil;
+import org.eclipse.emf.compare.rcp.internal.extension.IItemDescriptor;
+import org.eclipse.emf.compare.rcp.internal.extension.IItemRegistry;
+import org.eclipse.emf.compare.rcp.internal.extension.impl.AbstractItemDescriptor;
+import org.eclipse.emf.compare.rcp.internal.extension.impl.FactoryDescriptor;
+import org.eclipse.emf.compare.rcp.internal.extension.impl.ItemUtil;
 import org.eclipse.emf.compare.rcp.internal.preferences.EMFComparePreferences;
 import org.eclipse.emf.compare.scope.IComparisonScope;