Various API issues

Change-Id: I90b2bb9d1264046589c95e505b9c91c52927a317

29 files changed, 108 insertions, 86 deletions

diff --git a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/logical/view/PapyrusFilesSelectionLMVHandler.java b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/logical/view/PapyrusFilesSelectionLMVHandler.java
index 0f2a67c83..43e5cd7b2 100644
--- a/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/logical/view/PapyrusFilesSelectionLMVHandler.java
+++ b/plugins/org.eclipse.emf.compare.diagram.ide.ui.papyrus/src/org/eclipse/emf/compare/diagram/ide/ui/papyrus/internal/logical/view/PapyrusFilesSelectionLMVHandler.java
@@ -26,6 +26,7 @@ import org.eclipse.papyrus.infra.onefile.model.ISubResourceFile;
  * Handle, for the Logical Model View, the Papyrus files selection.
  * 
  * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ * @since 2.4
  */
 public class PapyrusFilesSelectionLMVHandler extends AbstractLogicalModelViewHandler {
 
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java
index 9797b8a26..ddd48dc6d 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/AttributeChangeItemProviderSpec.java
@@ -155,6 +155,7 @@ public class AttributeChangeItemProviderSpec extends AttributeChangeItemProvider
 		}
 	}
 
+	/* Missing override : only for EMF 2.10 and later. Do not tag. */
 	/**
 	 * {@inheritDoc}
 	 * 
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ComparisonItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ComparisonItemProviderSpec.java
index c6894e787..86a8ea29f 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ComparisonItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ComparisonItemProviderSpec.java
@@ -35,6 +35,7 @@ public class ComparisonItemProviderSpec extends ComparisonItemProvider implement
 		super(adapterFactory);
 	}
 
+	/* Missing override : only for EMF 2.10 and later. Do not tag. */
 	/**
 	 * {@inheritDoc}
 	 * 
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java
index b57a270d5..16d0eb130 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ConflictItemProviderSpec.java
@@ -83,6 +83,7 @@ public class ConflictItemProviderSpec extends ConflictItemProvider implements II
 		return image;
 	}
 
+	/* Missing override : only for EMF 2.10 and later. Do not tag. */
 	/**
 	 * {@inheritDoc}
 	 * 
@@ -105,8 +106,10 @@ public class ConflictItemProviderSpec extends ConflictItemProvider implements II
 		}
 
 		if (unresolvedDiffCount > 0) {
-			ret.append(
-					" ["	+ EMFCompareEditMessages.getString("unresolved", unresolvedDiffCount, conflict.getDifferences().size()) + "]", Style.DECORATIONS_STYLER); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			ret.append(" [" //$NON-NLS-1$
+					+ EMFCompareEditMessages.getString("unresolved", Integer.valueOf(unresolvedDiffCount), //$NON-NLS-1$
+							Integer.valueOf(conflict.getDifferences().size())) + "]", //$NON-NLS-1$
+					Style.DECORATIONS_STYLER);
 		} else {
 			ret.append(" [" + EMFCompareEditMessages.getString("resolved") + "]", Style.DECORATIONS_STYLER); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 		}
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/FeatureMapChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/FeatureMapChangeItemProviderSpec.java
index 828865852..3bc5cdf88 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/FeatureMapChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/FeatureMapChangeItemProviderSpec.java
@@ -33,6 +33,7 @@ import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
  * {@link #getImage(Object)}.
  * 
  * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ * @since 4.1
  */
 public class FeatureMapChangeItemProviderSpec extends FeatureMapChangeItemProvider implements IItemStyledLabelProvider, IItemDescriptionProvider {
 
@@ -140,6 +141,7 @@ public class FeatureMapChangeItemProviderSpec extends FeatureMapChangeItemProvid
 		}
 	}
 
+	/* Missing override : only for EMF 2.10 and later. Do not tag. */
 	/**
 	 * {@inheritDoc}
 	 * 
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java
index f6df2f7ef..da031515f 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchItemProviderSpec.java
@@ -99,6 +99,7 @@ public class MatchItemProviderSpec extends MatchItemProvider implements IItemSty
 		return ret;
 	}
 
+	/* Missing override : only for EMF 2.10 and later. Do not tag. */
 	/**
 	 * {@inheritDoc}
 	 * 
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchResourceItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchResourceItemProviderSpec.java
index 3395cfa81..01c0279b9 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchResourceItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/MatchResourceItemProviderSpec.java
@@ -176,6 +176,7 @@ public class MatchResourceItemProviderSpec extends MatchResourceItemProvider imp
 		return buffer.toString();
 	}
 
+	/* Missing override : only for EMF 2.10 and later. Do not tag. */
 	/**
 	 * {@inheritDoc}
 	 * 
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java
index d9400db12..b302a209c 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ReferenceChangeItemProviderSpec.java
@@ -218,6 +218,7 @@ public class ReferenceChangeItemProviderSpec extends ReferenceChangeItemProvider
 		}
 	}
 
+	/* Missing override : only for EMF 2.10 and later. Do not tag. */
 	/**
 	 * {@inheritDoc}
 	 * 
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java
index 0480d0ee2..8cde13074 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/ResourceAttachmentChangeItemProviderSpec.java
@@ -88,6 +88,7 @@ public class ResourceAttachmentChangeItemProviderSpec extends ResourceAttachment
 		return getStyledText(object).getString();
 	}
 
+	/* Missing override : only for EMF 2.10 and later. Do not tag. */
 	/**
 	 * {@inheritDoc}
 	 * 
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
index acf921774..678962e88 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
@@ -10,14 +10,9 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer;
 
-import static com.google.common.base.Predicates.and;
-import static com.google.common.base.Predicates.instanceOf;
-import static com.google.common.base.Predicates.not;
-import static com.google.common.collect.Iterables.any;
 import static com.google.common.collect.Iterables.size;
 import static org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.EMFCompareStructureMergeViewerContentProvider.CallbackType.IN_UI_ASYNC;
 import static org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.EMFCompareStructureMergeViewerContentProvider.CallbackType.IN_UI_SYNC;
-import static org.eclipse.emf.compare.utils.EMFComparePredicates.hasConflict;
 import static org.eclipse.emf.compare.utils.EMFComparePredicates.hasState;
 
 import com.google.common.base.Function;
@@ -64,7 +59,6 @@ import org.eclipse.emf.common.util.BasicDiagnostic;
 import org.eclipse.emf.common.util.BasicMonitor;
 import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.compare.Comparison;
-import org.eclipse.emf.compare.ConflictKind;
 import org.eclipse.emf.compare.Diff;
 import org.eclipse.emf.compare.DifferenceState;
 import org.eclipse.emf.compare.EMFCompare;
@@ -100,7 +94,6 @@ import org.eclipse.emf.compare.rcp.ui.internal.configuration.IMergePreviewModeCh
 import org.eclipse.emf.compare.rcp.ui.internal.configuration.SideLabelProvider;
 import org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.IColorChangeEvent;
 import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.StructureMergeViewerFilter;
-import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl.PseudoConflictsFilter;
 import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.StructureMergeViewerGrouper;
 import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.provider.TreeItemProviderAdapterFactorySpec;
 import org.eclipse.emf.compare.rcp.ui.internal.util.SWTUtil;
@@ -187,9 +180,6 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap
 		}
 	}
 
-	private static final Predicate<Diff> UNRESOLVED_AND_WITHOUT_PSEUDO_CONFLICT = and(
-			hasState(DifferenceState.UNRESOLVED), not(hasConflict(ConflictKind.PSEUDO)));
-
 	/** The width of the tree ruler. */
 	private static final int TREE_RULER_WIDTH = 17;
 
@@ -239,8 +229,6 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap
 
 	private CompareToolBar toolBar;
 
-	private boolean pseudoConflictsFilterEnabled;
-
 	private Navigatable navigatable;
 
 	private EMFCompareColor fColors;
@@ -631,8 +619,6 @@ public class EMFCompareStructureMergeViewer extends AbstractStructuredViewerWrap
 
 	@Subscribe
 	public void handleDifferenceFilterChange(IDifferenceFilterChange event) {
-		pseudoConflictsFilterEnabled = any(event.getSelectedDifferenceFilters(),
-				instanceOf(PseudoConflictsFilter.class));
 		SWTUtil.safeRefresh(this, false, true);
 		getContentProvider().runWhenReady(IN_UI_ASYNC, new Runnable() {
 			public void run() {
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
index d8f330c0a..6c8a6b015 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
@@ -125,6 +125,7 @@ class EMFCompareStructureMergeViewerLabelProvider extends AdapterFactoryLabelPro
 		return ret;
 	}
 
+	/* Missing override : only for EMF 2.10 and later. Do not tag. */
 	/**
 	 * {@inheritDoc}
 	 * 
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java
index bedac33f4..933e27596 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/SynchronizationModel.java
@@ -177,7 +177,7 @@ public final class SynchronizationModel implements IDiagnosable {
 	 * that do not exist locally.
 	 * 
 	 * @return The set of resources this synchronization model spans.
-	 * @since 4.0
+	 * @since 4.1
 	 */
 	public Set<IResource> getResources() {
 		if (resources == null) {
diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/EMFCompareIDEPlugin.java b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/EMFCompareIDEPlugin.java
index 1a246afd0..5d0c6183c 100644
--- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/EMFCompareIDEPlugin.java
+++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/EMFCompareIDEPlugin.java
@@ -107,7 +107,7 @@ public class EMFCompareIDEPlugin extends Plugin {
 	 * </p>
 	 * 
 	 * @return {@link ResourceSetHookRegistry}.
-	 * @since 3.1
+	 * @since 3.2
 	 */
 	public ResourceSetHookRegistry getResourceSetHookRegistry() {
 		return resourceSetHookRegistry;
diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/hook/AbstractResourceSetHooks.java b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/hook/AbstractResourceSetHooks.java
index 8d505e247..9b68300d6 100644
--- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/hook/AbstractResourceSetHooks.java
+++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/hook/AbstractResourceSetHooks.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
  * Abstract implementation of {@link IResourceSetHook}.
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
+ * @since 3.2
  */
 public abstract class AbstractResourceSetHooks implements IResourceSetHook {
 
diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/hook/IResourceSetHook.java b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/hook/IResourceSetHook.java
index 9774060f9..c27a873b4 100644
--- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/hook/IResourceSetHook.java
+++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/hook/IResourceSetHook.java
@@ -21,6 +21,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
  * model.
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
+ * @since 3.2
  */
 public interface IResourceSetHook {
 
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/GroupItemProviderAdapter.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/GroupItemProviderAdapter.java
index ed21d6f52..a652a331c 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/GroupItemProviderAdapter.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/GroupItemProviderAdapter.java
@@ -95,6 +95,7 @@ public class GroupItemProviderAdapter extends ItemProviderAdapter implements IEd
 		return group.getName();
 	}
 
+	/* Missing override : only for EMF 2.10 and later. Do not tag. */
 	/**
 	 * {@inheritDoc}
 	 * 
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java
index 06a7aa824..74f04009e 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/groups/provider/TreeNodeItemProviderSpec.java
@@ -141,6 +141,7 @@ public class TreeNodeItemProviderSpec extends TreeNodeItemProvider implements II
 		}
 	}
 
+	/* Missing override : only for EMF 2.10 and later. Do not tag. */
 	/**
 	 * {@inheritDoc}
 	 * 
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/structuremergeviewer/groups/AbstractDifferenceGroupProvider.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/structuremergeviewer/groups/AbstractDifferenceGroupProvider.java
index 2821cef0e..5ed83ab74 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/structuremergeviewer/groups/AbstractDifferenceGroupProvider.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/structuremergeviewer/groups/AbstractDifferenceGroupProvider.java
@@ -38,12 +38,20 @@ public abstract class AbstractDifferenceGroupProvider extends AdapterImpl implem
 	/** The cross reference adapter used by the difference group provider. */
 	private final ECrossReferenceAdapter crossReferenceAdapter;
 
-	/** A human-readable label for this group provider. This will be displayed in the EMF Compare UI. */

-	protected String label;

-

-	/** The initial activation state of the group provider. */

-	protected boolean activeByDefault;

-

+	/**
+	 * A human-readable label for this group provider. This will be displayed in the EMF Compare UI.
+	 * 
+	 * @since 4.1
+	 */
+	protected String label;
+
+	/**
+	 * The initial activation state of the group provider.
+	 * 
+	 * @since 4.1
+	 */
+	protected boolean activeByDefault;
+
 	/**
 	 * Groups held by this {@link IDifferenceGroupProvider}.
 	 */
@@ -69,52 +77,57 @@ public abstract class AbstractDifferenceGroupProvider extends AdapterImpl implem
 	}
 
 	/**
-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#getLabel()

-	 */

-	public String getLabel() {

-		return label;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#setLabel(java.lang.String)

-	 */

-	public void setLabel(String label) {

-		this.label = label;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#defaultSelected()

-	 */

-	public boolean defaultSelected() {

-		return activeByDefault;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#setDefaultSelected(boolean)

-	 */

-	public void setDefaultSelected(boolean active) {

-		this.activeByDefault = active;

-	}

-

-	/**

-	 * {@inheritDoc}

-	 * 

-	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#isEnabled(org

-	 *      .eclipse.emf.compare.scope.IComparisonScope, org.eclipse.emf.compare.Comparison)

-	 */

-	public boolean isEnabled(IComparisonScope scope, Comparison comparison) {

-		return true;

-	}

-

-	/**

+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#getLabel()
+	 * @since 4.1
+	 */
+	public String getLabel() {
+		return label;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#setLabel(java.lang.String)
+	 * @since 4.1
+	 */
+	public void setLabel(String label) {
+		this.label = label;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#defaultSelected()
+	 * @since 4.1
+	 */
+	public boolean defaultSelected() {
+		return activeByDefault;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#setDefaultSelected(boolean)
+	 * @since 4.1
+	 */
+	public void setDefaultSelected(boolean active) {
+		this.activeByDefault = active;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#isEnabled(org
+	 *      .eclipse.emf.compare.scope.IComparisonScope, org.eclipse.emf.compare.Comparison)
+	 * @since 4.1
+	 */
+	public boolean isEnabled(IComparisonScope scope, Comparison comparison) {
+		return true;
+	}
+
+	/**
 	 * Returns the cross reference adapter used by this difference group provider.
 	 * 
 	 * @return the crossReferenceAdapter the cross reference adapter used by this difference group provider.
@@ -152,7 +165,7 @@ public abstract class AbstractDifferenceGroupProvider extends AdapterImpl implem
 	 * {@inheritDoc}
 	 * 
 	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#getGroups(org.eclipse.emf.compare.Comparison)
-	 * @since 4.0
+	 * @since 4.1
 	 */
 	public Collection<? extends IDifferenceGroup> getGroups(Comparison aComparison) {
 		if (!groupsAreBuilt() || comparison != aComparison) {
@@ -171,7 +184,7 @@ public abstract class AbstractDifferenceGroupProvider extends AdapterImpl implem
 	 * @param aComparison
 	 *            comparison against which the groups will be built.
 	 * @return Newly built collections of {@link IDifferenceGroup}.
-	 * @since 4.0
+	 * @since 4.1
 	 */
 	protected Collection<? extends IDifferenceGroup> buildGroups(Comparison aComparison) {
 		return ImmutableList.of();
@@ -181,7 +194,7 @@ public abstract class AbstractDifferenceGroupProvider extends AdapterImpl implem
 	 * {@inheritDoc}
 	 * 
 	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider2#groupsAreBuilt()
-	 * @since 4.0
+	 * @since 4.1
 	 */
 	public boolean groupsAreBuilt() {
 		return groups != null && comparison != null;
@@ -189,7 +202,7 @@ public abstract class AbstractDifferenceGroupProvider extends AdapterImpl implem
 
 	/**
 	 * @return comparison against which the groups has been built.
-	 * @since 4.0
+	 * @since 4.1
 	 */
 	protected Comparison getComparison() {
 		return comparison;
@@ -199,7 +212,7 @@ public abstract class AbstractDifferenceGroupProvider extends AdapterImpl implem
 	 * {@inheritDoc}
 	 * 
 	 * @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#dispose()
-	 * @since 4.0
+	 * @since 4.1
 	 */
 	public void dispose() {
 		comparison = null;
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/structuremergeviewer/groups/IDifferenceGroupProvider2.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/structuremergeviewer/groups/IDifferenceGroupProvider2.java
index 5cbbd326d..f8cb3e6a7 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/structuremergeviewer/groups/IDifferenceGroupProvider2.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/structuremergeviewer/groups/IDifferenceGroupProvider2.java
@@ -10,13 +10,12 @@
  *******************************************************************************/
 package org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups;
 
-
 /**
  * Extended interface of {@link IDifferenceGroupProvider} that gives information on the building status of its
  * groups.
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
- * @since 4.0
+ * @since 4.1
  */
 public interface IDifferenceGroupProvider2 extends IDifferenceGroupProvider {
 
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 891ced9a9..449ef0e44 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
@@ -529,7 +529,7 @@ public class EMFCompareRCPPlugin extends Plugin {
 	 * registered. It filters available adapter factories using preferences.
 	 * 
 	 * @return the the adapter factory descriptor registry to which extension will be registered
-	 * @since 3.1
+	 * @since 2.3
 	 */
 	public RankedAdapterFactoryDescriptor.Registry createFilteredAdapterFactoryRegistry() {
 		final List<String> disabledAdapterFactories = EMFComparePreferences
diff --git a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java
index a458fd36c..4cd278d1c 100644
--- a/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java
+++ b/plugins/org.eclipse.emf.compare.uml2.tests/src/org/eclipse/emf/compare/uml2/tests/stereotypes/AbstractStereotypedElementChangeTests.java
@@ -55,7 +55,6 @@ import org.eclipse.uml2.uml.util.UMLUtil;
  * 
  * @author <a href="mailto:arthur.daussy@obeo.fr">Arthur Daussy</a>
  */
-@SuppressWarnings("restriction")
 public abstract class AbstractStereotypedElementChangeTests extends AbstractUMLProfileTest {
 
 	@Override
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/CompareFactory.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/CompareFactory.java
index 93e7f9afd..71ea5e7e7 100644
--- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/CompareFactory.java
+++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/CompareFactory.java
@@ -105,6 +105,7 @@ public interface CompareFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @return a new object of class '<em>Feature Map Change</em>'.
 	 * @generated
+	 * @since 3.2
 	 */
 	FeatureMapChange createFeatureMapChange();
 
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/FeatureMapChange.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/FeatureMapChange.java
index 046da3073..13f10ec62 100644
--- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/FeatureMapChange.java
+++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/FeatureMapChange.java
@@ -32,6 +32,7 @@ import org.eclipse.emf.ecore.EAttribute;
  * @see org.eclipse.emf.compare.ComparePackage#getFeatureMapChange()
  * @model
  * @generated
+ * @since 3.2
  */
 public interface FeatureMapChange extends Diff {
 	/**
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/util/CompareSwitch.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/util/CompareSwitch.java
index 0af60eca7..424d34430 100644
--- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/util/CompareSwitch.java
+++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/util/CompareSwitch.java
@@ -294,6 +294,7 @@ public class CompareSwitch<T> {
 	 * @return the result of interpreting the object as an instance of '<em>Feature Map Change</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
+	 * @since 3.2
 	 */
 	public T caseFeatureMapChange(FeatureMapChange object) {
 		return null;
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/conflict/DefaultConflictDetector.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/conflict/DefaultConflictDetector.java
index 670ccda40..6562fa773 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/conflict/DefaultConflictDetector.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/conflict/DefaultConflictDetector.java
@@ -250,11 +250,11 @@ public class DefaultConflictDetector implements IConflictDetector {
 	 *            The feature map change for which we are to try and determine conflicts.
 	 * @param candidates
 	 *            An iterable over the FeatureMapChanges that are possible candidates for conflicts.
+	 * @since 3.2
 	 */
 	protected void checkContainmentFeatureMapConflict(Comparison comparison, FeatureMapChange diff,
 			Iterable<FeatureMapChange> candidates) {
 		final FeatureMap.Entry entry = (FeatureMap.Entry)diff.getValue();
-		final EStructuralFeature key = entry.getEStructuralFeature();
 		final Object value = entry.getValue();
 		final Match valueMatch;
 		if (value instanceof EObject) {
@@ -305,6 +305,7 @@ public class DefaultConflictDetector implements IConflictDetector {
 	 *            Containment feature map changes for which we need to check possible conflicts.
 	 * @param candidate
 	 *            A feature map change that point to the same value as {@code diff}.
+	 * @since 3.2
 	 */
 	protected void checkContainmentFeatureMapConflict(Comparison comparison, FeatureMapChange diff,
 			FeatureMapChange candidate) {
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/IDiffProcessor.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/IDiffProcessor.java
index bb53b509d..07f761c25 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/IDiffProcessor.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/IDiffProcessor.java
@@ -87,6 +87,7 @@ public interface IDiffProcessor {
 	 *            Source of the difference. For two way comparisons, this will always be
 	 *            {@link DifferenceSource#LEFT}. Otherwise, this will indicate the side on which this
 	 *            difference has been detected.
+	 * @since 3.2
 	 */
 	void featureMapChange(Match match, EAttribute attribute, Object value, DifferenceKind kind,
 			DifferenceSource source);
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/equi/DefaultEquiEngine.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/equi/DefaultEquiEngine.java
index c804f7d74..d0893ffb1 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/equi/DefaultEquiEngine.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/equi/DefaultEquiEngine.java
@@ -169,6 +169,7 @@ public class DefaultEquiEngine implements IEquiEngine {
 	 *            The comparison this engine is expected to complete.
 	 * @param featureMapChange
 	 *            The difference that is to be checked
+	 * @since 3.2
 	 */
 	protected void checkForEquivalences(final Comparison comparison, final FeatureMapChange featureMapChange) {
 		Equivalence equivalence = featureMapChange.getEquivalence();
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java
index 78bd1a729..12fa7f0c4 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AbstractMerger.java
@@ -100,7 +100,7 @@ public abstract class AbstractMerger implements IMerger2 {
 	/**
 	 * {@inheritDoc}
 	 * 
-	 * @since 3.1
+	 * @since 3.2
 	 */
 	public Set<Diff> getDirectMergeDependencies(Diff diff, boolean mergeRightToLeft) {
 		final Set<Diff> dependencies = new LinkedHashSet<Diff>();
@@ -134,7 +134,7 @@ public abstract class AbstractMerger implements IMerger2 {
 	/**
 	 * {@inheritDoc}
 	 * 
-	 * @since 3.1
+	 * @since 3.2
 	 */
 	public Set<Diff> getDirectResultingMerges(Diff target, boolean mergeRightToLeft) {
 		final Set<Diff> resulting = new LinkedHashSet<Diff>();
@@ -165,7 +165,7 @@ public abstract class AbstractMerger implements IMerger2 {
 	/**
 	 * {@inheritDoc}
 	 * 
-	 * @since 3.1
+	 * @since 3.2
 	 */
 	public Set<Diff> getDirectResultingRejections(Diff target, boolean mergeRightToLeft) {
 		final Set<Diff> directlyImpliedRejections = new LinkedHashSet<Diff>();
@@ -202,7 +202,7 @@ public abstract class AbstractMerger implements IMerger2 {
 	 * conflict is resolved before even trying to merge anything.</li>
 	 * <li>Equivalent {@link ReferenceChange} and {@link FeatureMapChange} differences: in this case the
 	 * {@link FeatureMapChange} difference will take precedence over the {@link ReferenceChange}. This happens
-	 * in order to prevent special cases in which the {@link ReferenceChangeMerger} cannot ensure the correct	 
+	 * in order to prevent special cases in which the {@link ReferenceChangeMerger} cannot ensure the correct
 	 * order of the feature map attribute.</li>
 	 * </ol>
 	 * </p>
@@ -237,7 +237,8 @@ public abstract class AbstractMerger implements IMerger2 {
 	 *            The {@link Diff} we need to check the equivalence for a 'master' difference.
 	 * @param mergeRightToLeft
 	 *            Direction of the current merging.
-	 * @return The master difference of {@code diff} and its equivalent diffs. This method may return <code>null</code> if there is no master diff.
+	 * @return The master difference of {@code diff} and its equivalent diffs. This method may return
+	 *         <code>null</code> if there is no master diff.
 	 */
 	private Diff getMasterEquivalenceForReferenceChange(ReferenceChange diff, boolean mergeRightToLeft) {
 		Diff masterDiff = getMasterEquivalenceOnEOpposite(diff, mergeRightToLeft);
@@ -731,7 +732,7 @@ public abstract class AbstractMerger implements IMerger2 {
 	 *            Direction of the merge.
 	 * @return <code>true</code> if {@code diff} will add a value with this merge, <code>false</code>
 	 *         otherwise.
-	 * @since 3.1
+	 * @since 3.2
 	 */
 	protected boolean isAdd(ReferenceChange diff, boolean rightToLeft) {
 		if (rightToLeft) {
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/ReferenceUtil.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/ReferenceUtil.java
index 958fcad5f..c60ba88a5 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/ReferenceUtil.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/utils/ReferenceUtil.java
@@ -149,6 +149,7 @@ public final class ReferenceUtil {
 	 * @param reference
 	 *            the given EReference.
 	 * @return true if the given reference is a FeatureMap-derived feature, false otherwise.
+	 * @since 3.2
 	 */
 	public static boolean isFeatureMapDerivedFeature(EReference reference) {
 		if (reference.isDerived() && reference.isTransient() && reference.isVolatile()) {