From a94340ae6773ae6909c102041a13adef3a00bd99 Mon Sep 17 00:00:00 2001 From: Laurent Goubet Date: Tue, 5 May 2015 14:42:09 +0200 Subject: [PATCH] Fix some of the warnings Change-Id: Ibddbf4b79fdf497d2ce785789bf8d0cf2e6c7a6a --- plugins/org.eclipse.emf.compare.doc/build.properties | 3 ++- .../eclipse/emf/compare/provider/FeatureMapChangeItemProvider.java | 2 ++ .../emf/compare/provider/ResourceLocationChangeItemProvider.java | 2 ++ .../eclipse/emf/compare/domain/impl/EMFCompareEditingDomain.java | 1 + .../src/org/eclipse/emf/compare/provider/spec/Strings.java | 1 + .../emf/compare/egit/internal/adapter/EGitAdapterFactory.java | 2 +- .../src/org/eclipse/emf/compare/ide/internal/utils/URIStorage.java | 1 + .../src/org/eclipse/emf/compare/ide/utils/StorageTraversal.java | 1 + .../src/org/eclipse/emf/compare/rcp/ui/EMFCompareRCPUIPlugin.java | 2 ++ .../src-gen/org/eclipse/emf/compare/CompareFactory.java | 2 ++ .../src-gen/org/eclipse/emf/compare/MatchResource.java | 1 + .../src-gen/org/eclipse/emf/compare/impl/CompareFactoryImpl.java | 2 ++ .../src-gen/org/eclipse/emf/compare/impl/ComparePackageImpl.java | 7 +++++++ .../src-gen/org/eclipse/emf/compare/impl/DiffImpl.java | 1 + .../src-gen/org/eclipse/emf/compare/impl/FeatureMapChangeImpl.java | 2 ++ .../src-gen/org/eclipse/emf/compare/impl/MatchImpl.java | 1 - .../src-gen/org/eclipse/emf/compare/impl/MatchResourceImpl.java | 2 ++ .../org/eclipse/emf/compare/impl/ResourceLocationChangeImpl.java | 2 ++ .../org/eclipse/emf/compare/util/CompareAdapterFactory.java | 2 ++ .../src-gen/org/eclipse/emf/compare/util/CompareSwitch.java | 1 + .../org/eclipse/emf/compare/conflict/DefaultConflictDetector.java | 1 + .../src/org/eclipse/emf/compare/diff/DiffBuilder.java | 1 + .../src/org/eclipse/emf/compare/merge/AttributeChangeMerger.java | 1 + .../src/org/eclipse/emf/compare/merge/FeatureMapChangeMerger.java | 1 + .../src/org/eclipse/emf/compare/merge/IMerger2.java | 2 +- 25 files changed, 40 insertions(+), 4 deletions(-) diff --git a/plugins/org.eclipse.emf.compare.doc/build.properties b/plugins/org.eclipse.emf.compare.doc/build.properties index c3f6f3755..d7dad4719 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 9ad724d0d..3ee95cf4b 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 @@ import org.eclipse.emf.edit.provider.ViewerNotification; * * * @generated + * @since 4.1 */ +@SuppressWarnings("all") public class FeatureMapChangeItemProvider extends DiffItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider { /** * 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 d04f2e6c0..d082b4290 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 @@ import org.eclipse.emf.edit.provider.ViewerNotification; * * * @generated + * @since 4.1 */ +@SuppressWarnings("all") public class ResourceLocationChangeItemProvider extends DiffItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider { /** * 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 492a33871..c55392d46 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 @@ public class EMFCompareEditingDomain implements ICompareEditingDomain, IDisposab * @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 f41573c03..38127db31 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 @@ public final class Strings { * @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 a0d7edd15..7d486126e 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 @@ import org.eclipse.emf.compare.ide.utils.IStoragePathProvider; * @author Laurent Goubet */ // 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 4d4788428..6aa507b77 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 @@ public class URIStorage implements IStorage { * * @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 b0b28288e..84fcb194c 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 @@ public class StorageTraversal implements IAdaptable, IDiagnosable { * * @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 881d64cbc..a51828767 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 @@ public class EMFCompareRCPUIPlugin extends AbstractUIPlugin { /** * @return the compare configuration object. + * @since 4.1 */ public IEMFCompareConfiguration getEMFCompareConfiguration() { return compareConfiguration; @@ -462,6 +463,7 @@ public class EMFCompareRCPUIPlugin extends AbstractUIPlugin { * * @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 b4765a559..ab3725818 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 @@ public interface CompareFactory extends EFactory { * * @return a new object of class 'Resource Location Change'. * @generated + * @since 3.2 */ ResourceLocationChange createResourceLocationChange(); @@ -114,6 +115,7 @@ public interface CompareFactory extends EFactory { * * @return a new object of class 'Feature Map Change'. * @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 202c77311..ecf9ac0c3 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 @@ public interface MatchResource extends EObject { * @see org.eclipse.emf.compare.ComparePackage#getMatchResource_LocationChanges() * @model containment="true" upper="2" * @generated + * @since 3.2 */ EList 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 04aa9c760..07c2f079b 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 @@ public class CompareFactoryImpl extends EFactoryImpl implements CompareFactory { * * * @generated NOT + * @since 3.2 */ public ResourceLocationChange createResourceLocationChange() { return new ResourceLocationChangeSpec(); @@ -223,6 +224,7 @@ public class CompareFactoryImpl extends EFactoryImpl implements CompareFactory { * * * @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 896de1b29..7d1521d91 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 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { * * * @generated + * @since 3.2 */ public EReference getMatchResource_LocationChanges() { return (EReference)matchResourceEClass.getEStructuralFeatures().get(7); @@ -533,6 +534,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { * * * @generated + * @since 3.2 */ public EClass getResourceLocationChange() { return resourceLocationChangeEClass; @@ -542,6 +544,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { * * * @generated + * @since 3.2 */ public EAttribute getResourceLocationChange_BaseLocation() { return (EAttribute)resourceLocationChangeEClass.getEStructuralFeatures().get(0); @@ -551,6 +554,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { * * * @generated + * @since 3.2 */ public EAttribute getResourceLocationChange_ChangedLocation() { return (EAttribute)resourceLocationChangeEClass.getEStructuralFeatures().get(1); @@ -607,6 +611,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * * @generated + * @since 3.2 */ public EClass getFeatureMapChange() { return featureMapChangeEClass; @@ -615,6 +620,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * * @generated + * @since 3.2 */ public EReference getFeatureMapChange_Attribute() { return (EReference)featureMapChangeEClass.getEStructuralFeatures().get(0); @@ -623,6 +629,7 @@ public class ComparePackageImpl extends EPackageImpl implements ComparePackage { /** * * @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 452d6fbb1..11e5754b3 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 @@ public class DiffImpl extends MinimalEObjectImpl implements Diff { * * * @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 990370183..054303fc9 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 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; *

* * @generated + * @since 3.2 */ public class FeatureMapChangeImpl extends DiffImpl implements FeatureMapChange { /** @@ -41,6 +42,7 @@ public class FeatureMapChangeImpl extends DiffImpl implements FeatureMapChange { * * @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 76c3f34d4..2e9d4e82f 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.ENotificationImpl; 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 10c381e48..0da732755 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 @@ public class MatchResourceImpl extends MinimalEObjectImpl implements MatchResour * @see #getLocationChanges() * @generated * @ordered + * @since 3.2 */ protected EList locationChanges; @@ -391,6 +392,7 @@ public class MatchResourceImpl extends MinimalEObjectImpl implements MatchResour * * * @generated + * @since 3.2 */ public EList 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 1da64ece2..37bd41445 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 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; *

* * @generated + * @since 3.2 */ public class ResourceLocationChangeImpl extends DiffImpl implements ResourceLocationChange { /** @@ -37,6 +38,7 @@ public class ResourceLocationChangeImpl extends DiffImpl implements ResourceLoca * * @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 7c4e92360..b831b5608 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 @@ public class CompareAdapterFactory extends AdapterFactoryImpl { * @return the new adapter. * @see org.eclipse.emf.compare.ResourceLocationChange * @generated + * @since 3.2 */ public Adapter createResourceLocationChangeAdapter() { return null; @@ -276,6 +277,7 @@ public class CompareAdapterFactory extends AdapterFactoryImpl { * @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 3a2058569..2d0f30e5c 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 @@ public class CompareSwitch { * @return the result of interpreting the object as an instance of 'Feature Map Change'. * @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 779e17f90..ae3d25412 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 @@ public class DefaultConflictDetector implements IConflictDetector { * @param origin * The original version. * @return true 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 7bb343e1b..930302248 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 @@ public class DiffBuilder implements IDiffProcessor { * @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 9393891d5..4b424a2f2 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 @@ public class AttributeChangeMerger extends AbstractMerger { * @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 7f7509dfb..8fd6aab60 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 @@ import org.eclipse.emf.ecore.xmi.XMIResource; * This specific implementation of {@link AbstractMerger} will be used to merge attribute changes. * * @author Laurent Goubet + * @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 f735a10e0..f2587a8a3 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 @@ import org.eclipse.emf.compare.Diff; *

* * @author Laurent Goubet - * @since 3.1 + * @since 3.2 */ public interface IMerger2 extends IMerger { /** -- 2.11.4.GIT