Package org.eclipse.emf.spi.cdo
Class AbstractObjectConflictResolver.MergeLocalChangesPerFeature
java.lang.Object
org.eclipse.emf.spi.cdo.AbstractConflictResolver
org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver
org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMerge
org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.MergeLocalChangesPerFeature
- All Implemented Interfaces:
CDOConflictResolver,CDOConflictResolver2,CDOAdapterPolicy
- Enclosing class:
AbstractObjectConflictResolver
@Deprecated
public static class AbstractObjectConflictResolver.MergeLocalChangesPerFeature
extends AbstractObjectConflictResolver.ThreeWayMerge
Deprecated.
As of 4.0 use CDOMergingConflictResolver
Legacy per-feature conflict strategy that applies the transaction's local feature changes after adopting remote
object state. Use
CDOMergingConflictResolver for the current merger-based approach.- Since:
- 2.0
- Author:
- Eike Stepper
-
Nested Class Summary
Nested classes/interfaces inherited from class org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMerge
AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollectorNested classes/interfaces inherited from class org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver
AbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMergeNested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolver
CDOConflictResolver.NonConflictAware -
Field Summary
Fields inherited from interface org.eclipse.emf.cdo.view.CDOAdapterPolicy
ALL, CDO, NONE -
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionprotected booleanhasFeatureConflicts(CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas) Deprecated.protected voidresolveConflict(CDOObject conflict, CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas) Deprecated.Methods inherited from class org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMerge
hookTransaction, isValid, resolveConflict, resolveConflicts, unhookTransactionMethods inherited from class org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver
changeObject, readObject, resolveConflict, resolveConflicts, rollbackObjectMethods inherited from class org.eclipse.emf.spi.cdo.AbstractConflictResolver
getTransaction, setTransactionMethods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, waitMethods inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolver
getTransaction, setTransaction
-
Constructor Details
-
MergeLocalChangesPerFeature
Deprecated.
-
-
Method Details
-
resolveConflict
@Deprecated protected void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas) Deprecated.- Specified by:
resolveConflictin classAbstractObjectConflictResolver.ThreeWayMerge
-
hasFeatureConflicts
@Deprecated protected boolean hasFeatureConflicts(CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas) Deprecated.
-