Fix some of the warnings
Change-Id: Ibddbf4b79fdf497d2ce785789bf8d0cf2e6c7a6a
diff --git a/plugins/org.eclipse.emf.compare.doc/build.properties b/plugins/org.eclipse.emf.compare.doc/build.properties
index c3f6f37..d7dad47 100644
--- a/plugins/org.eclipse.emf.compare.doc/build.properties
+++ b/plugins/org.eclipse.emf.compare.doc/build.properties
@@ -10,7 +10,8 @@
#################################################################################
bin.includes = META-INF/,\
plugin.properties,\
- about.html
+ about.html,\
+ plugin.xml
src.includes = src/,\
about.html
# for the javadoc generation.
diff --git a/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/FeatureMapChangeItemProvider.java b/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/FeatureMapChangeItemProvider.java
index 9ad724d..3ee95cf 100644
--- a/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/FeatureMapChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/FeatureMapChangeItemProvider.java
@@ -37,7 +37,9 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
+ * @since 4.1
*/
+@SuppressWarnings("all")
public class FeatureMapChangeItemProvider extends DiffItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ResourceLocationChangeItemProvider.java b/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ResourceLocationChangeItemProvider.java
index d04f2e6..d082b42 100644
--- a/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ResourceLocationChangeItemProvider.java
+++ b/plugins/org.eclipse.emf.compare.edit/src-gen/org/eclipse/emf/compare/provider/ResourceLocationChangeItemProvider.java
@@ -35,7 +35,9 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
+ * @since 4.1
*/
+@SuppressWarnings("all")
public class ResourceLocationChangeItemProvider extends DiffItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java
index 492a338..c55392d 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java
@@ -380,6 +380,7 @@
* @param runnable
* the runnable to execute for the actual merge operation.
* @return The copy command, ready for use.
+ * @since 4.1
*/
public ICompareCopyCommand createCopyAllNonConflictingCommand(Comparison comparison, boolean leftToRight,
IMerger.Registry mergerRegistry, IMergeAllNonConflictingRunnable runnable) {
diff --git a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/Strings.java b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/Strings.java
index f41573c..38127db 100644
--- a/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/Strings.java
+++ b/plugins/org.eclipse.emf.compare.edit/src/org/eclipse/emf/compare/provider/spec/Strings.java
@@ -52,6 +52,7 @@
* @param original
* the original string to remove line breaks from.
* @return the string without line breaks but blanks instead.
+ * @since 4.1
*/
public static String removeLineBreaks(String original) {
return original.replaceAll("\\r\\n|\\r|\\n", " "); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/adapter/EGitAdapterFactory.java b/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/adapter/EGitAdapterFactory.java
index a0d7edd..7d48612 100644
--- a/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/adapter/EGitAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.egit/src/org/eclipse/emf/compare/egit/internal/adapter/EGitAdapterFactory.java
@@ -20,7 +20,7 @@
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
*/
// Suppress warnings : interface signatures are raw, so we can't generify
-@SuppressWarnings("rawtypes")
+@SuppressWarnings({"rawtypes", "unchecked", })
public class EGitAdapterFactory implements IAdapterFactory {
/** {@inheritDoc} */
public Object getAdapter(Object adaptableObject, Class adapterType) {
diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/URIStorage.java b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/URIStorage.java
index 4d47884..6aa507b 100644
--- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/URIStorage.java
+++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/internal/utils/URIStorage.java
@@ -63,6 +63,7 @@
*
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @SuppressWarnings("unchecked")
public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
return null;
}
diff --git a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/StorageTraversal.java b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/StorageTraversal.java
index b0b2828..84fcb19 100644
--- a/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/StorageTraversal.java
+++ b/plugins/org.eclipse.emf.compare.ide/src/org/eclipse/emf/compare/ide/utils/StorageTraversal.java
@@ -112,6 +112,7 @@
*
* @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
*/
+ @SuppressWarnings("unchecked")
public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
if (adapter == org.eclipse.core.resources.mapping.ResourceTraversal.class) {
// Team's resource traversal only knows about IResources.
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java
index 881d64c..a518287 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java
@@ -452,6 +452,7 @@
/**
* @return the compare configuration object.
+ * @since 4.1
*/
public IEMFCompareConfiguration getEMFCompareConfiguration() {
return compareConfiguration;
@@ -462,6 +463,7 @@
*
* @param compareConfiguration
* the compare configuration object
+ * @since 4.1
*/
public void setEMFCompareConfiguration(IEMFCompareConfiguration compareConfiguration) {
this.compareConfiguration = compareConfiguration;
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 b4765a5..ab37258 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
@@ -87,6 +87,7 @@
* <!-- end-user-doc -->
* @return a new object of class '<em>Resource Location Change</em>'.
* @generated
+ * @since 3.2
*/
ResourceLocationChange createResourceLocationChange();
@@ -114,6 +115,7 @@
* <!-- 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/MatchResource.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/MatchResource.java
index 202c773..ecf9ac0 100644
--- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/MatchResource.java
+++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/MatchResource.java
@@ -240,6 +240,7 @@
* @see org.eclipse.emf.compare.ComparePackage#getMatchResource_LocationChanges()
* @model containment="true" upper="2"
* @generated
+ * @since 3.2
*/
EList<ResourceLocationChange> getLocationChanges();
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/CompareFactoryImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/CompareFactoryImpl.java
index 04aa9c7..07c2f07 100644
--- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/CompareFactoryImpl.java
+++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/CompareFactoryImpl.java
@@ -198,6 +198,7 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated NOT
+ * @since 3.2
*/
public ResourceLocationChange createResourceLocationChange() {
return new ResourceLocationChangeSpec();
@@ -223,6 +224,7 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated NOT
+ * @since 3.2
*/
public FeatureMapChange createFeatureMapChange() {
return new FeatureMapChangeSpec();
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java
index 896de1b..7d1521d 100644
--- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java
+++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java
@@ -348,6 +348,7 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
+ * @since 3.2
*/
public EReference getMatchResource_LocationChanges() {
return (EReference)matchResourceEClass.getEStructuralFeatures().get(7);
@@ -533,6 +534,7 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
+ * @since 3.2
*/
public EClass getResourceLocationChange() {
return resourceLocationChangeEClass;
@@ -542,6 +544,7 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
+ * @since 3.2
*/
public EAttribute getResourceLocationChange_BaseLocation() {
return (EAttribute)resourceLocationChangeEClass.getEStructuralFeatures().get(0);
@@ -551,6 +554,7 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
+ * @since 3.2
*/
public EAttribute getResourceLocationChange_ChangedLocation() {
return (EAttribute)resourceLocationChangeEClass.getEStructuralFeatures().get(1);
@@ -607,6 +611,7 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
+ * @since 3.2
*/
public EClass getFeatureMapChange() {
return featureMapChangeEClass;
@@ -615,6 +620,7 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
+ * @since 3.2
*/
public EReference getFeatureMapChange_Attribute() {
return (EReference)featureMapChangeEClass.getEStructuralFeatures().get(0);
@@ -623,6 +629,7 @@
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
+ * @since 3.2
*/
public EAttribute getFeatureMapChange_Value() {
return (EAttribute)featureMapChangeEClass.getEStructuralFeatures().get(1);
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/DiffImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/DiffImpl.java
index 452d6fb..11e5754 100644
--- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/DiffImpl.java
+++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/DiffImpl.java
@@ -245,6 +245,7 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
+ * @since 3.2
*/
public Match basicGetMatch() {
// TODO: implement this method to return the 'Match' reference
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/FeatureMapChangeImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/FeatureMapChangeImpl.java
index 9903701..054303f 100644
--- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/FeatureMapChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/FeatureMapChangeImpl.java
@@ -34,6 +34,7 @@
* </p>
*
* @generated
+ * @since 3.2
*/
public class FeatureMapChangeImpl extends DiffImpl implements FeatureMapChange {
/**
@@ -41,6 +42,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @SuppressWarnings("hiding")
public static final String copyright = "Copyright (c) 2012 Obeo.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Obeo - initial API and implementation"; //$NON-NLS-1$
/**
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/MatchImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/MatchImpl.java
index 76c3f34..2e9d4e8 100644
--- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/MatchImpl.java
+++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/MatchImpl.java
@@ -31,7 +31,6 @@
import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
import org.eclipse.emf.ecore.util.InternalEList;
/**
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/MatchResourceImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/MatchResourceImpl.java
index 10c381e..0da7327 100644
--- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/MatchResourceImpl.java
+++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/MatchResourceImpl.java
@@ -187,6 +187,7 @@
* @see #getLocationChanges()
* @generated
* @ordered
+ * @since 3.2
*/
protected EList<ResourceLocationChange> locationChanges;
@@ -391,6 +392,7 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
+ * @since 3.2
*/
public EList<ResourceLocationChange> getLocationChanges() {
if (locationChanges == null) {
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ResourceLocationChangeImpl.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ResourceLocationChangeImpl.java
index 1da64ec..37bd414 100644
--- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ResourceLocationChangeImpl.java
+++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/impl/ResourceLocationChangeImpl.java
@@ -30,6 +30,7 @@
* </p>
*
* @generated
+ * @since 3.2
*/
public class ResourceLocationChangeImpl extends DiffImpl implements ResourceLocationChange {
/**
@@ -37,6 +38,7 @@
* <!-- end-user-doc -->
* @generated
*/
+ @SuppressWarnings("hiding")
public static final String copyright = "Copyright (c) 2012 Obeo.\r\nAll rights reserved. This program and the accompanying materials\r\nare made available under the terms of the Eclipse Public License v1.0\r\nwhich accompanies this distribution, and is available at\r\nhttp://www.eclipse.org/legal/epl-v10.html\r\n\r\nContributors:\r\n Obeo - initial API and implementation"; //$NON-NLS-1$
/**
diff --git a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/util/CompareAdapterFactory.java b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/util/CompareAdapterFactory.java
index 7c4e923..b831b56 100644
--- a/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/util/CompareAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare/src-gen/org/eclipse/emf/compare/util/CompareAdapterFactory.java
@@ -234,6 +234,7 @@
* @return the new adapter.
* @see org.eclipse.emf.compare.ResourceLocationChange
* @generated
+ * @since 3.2
*/
public Adapter createResourceLocationChangeAdapter() {
return null;
@@ -276,6 +277,7 @@
* @return the new adapter.
* @see org.eclipse.emf.compare.FeatureMapChange
* @generated
+ * @since 3.2
*/
public Adapter createFeatureMapChangeAdapter() {
return null;
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 3a20585..2d0f30e 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
@@ -319,6 +319,7 @@
* @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 779e17f..ae3d254 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
@@ -584,6 +584,7 @@
* @param origin
* The original version.
* @return <code>true</code> if they are mergeable, false otherwise.
+ * @since 3.2
*/
protected boolean isMergeableText(final String left, final String right, final String origin) {
ThreeWayTextDiff textDiff = new ThreeWayTextDiff(origin, left, right);
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/DiffBuilder.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/DiffBuilder.java
index 7bb343e..9303022 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/DiffBuilder.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/diff/DiffBuilder.java
@@ -69,6 +69,7 @@
* @see org.eclipse.emf.compare.diff.IDiffProcessor#featureMapChange(org.eclipse.emf.compare.Match,
* org.eclipse.emf.ecore.EAttribute, java.lang.Object, org.eclipse.emf.compare.DifferenceKind,
* org.eclipse.emf.compare.DifferenceSource)
+ * @since 3.2
*/
public 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/merge/AttributeChangeMerger.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AttributeChangeMerger.java
index 9393891..4b424a2 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AttributeChangeMerger.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/AttributeChangeMerger.java
@@ -625,6 +625,7 @@
* @param origin
* The original version of the String.
* @return The merged version.
+ * @since 3.2
*/
protected String performThreeWayTextMerge(final String left, final String right, final String origin) {
ThreeWayTextDiff textDiff = new ThreeWayTextDiff(origin, left, right);
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/FeatureMapChangeMerger.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/FeatureMapChangeMerger.java
index 7f7509d..8fd6aab 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/FeatureMapChangeMerger.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/FeatureMapChangeMerger.java
@@ -43,6 +43,7 @@
* This specific implementation of {@link AbstractMerger} will be used to merge attribute changes.
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
+ * @since 3.2
*/
public class FeatureMapChangeMerger extends AbstractMerger {
/**
diff --git a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/IMerger2.java b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/IMerger2.java
index f735a10..f2587a8 100644
--- a/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/IMerger2.java
+++ b/plugins/org.eclipse.emf.compare/src/org/eclipse/emf/compare/merge/IMerger2.java
@@ -27,7 +27,7 @@
* </p>
*
* @author <a href="mailto:laurent.goubet@obeo.fr">Laurent Goubet</a>
- * @since 3.1
+ * @since 3.2
*/
public interface IMerger2 extends IMerger {
/**
