Package org.eclipse.emf.spi.cdo
Class AbstractObjectConflictResolver.ThreeWayMerge
java.lang.Object
org.eclipse.emf.spi.cdo.AbstractConflictResolver
org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver
org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMerge
- All Implemented Interfaces:
CDOConflictResolver,CDOConflictResolver2,CDOAdapterPolicy
- Direct Known Subclasses:
AbstractObjectConflictResolver.MergeLocalChangesPerFeature
- Enclosing class:
- AbstractObjectConflictResolver
public abstract static class AbstractObjectConflictResolver.ThreeWayMerge
extends AbstractObjectConflictResolver
implements CDOAdapterPolicy
If the meaning of this type isn't clear, there really should be more of a description here...
- Since:
- 2.0
- Author:
- Eike Stepper
-
Nested Class Summary
Nested ClassesModifier and TypeClassDescriptionstatic classIf the meaning of this type isn't clear, there really should be more of a description here...Nested 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 voidhookTransaction(CDOTransaction transaction) booleanReturnstrueif the given adapter on the given object should trigger a certain operation or behavior,falseotherwise.protected voidresolveConflict(CDOObject conflict, CDORevision oldRemoteRevision, CDORevisionDelta localDelta, CDORevisionDelta remoteDelta, List<CDORevisionDelta> allRemoteDeltas) Resolves the conflict of a single object in the current transaction.protected abstract voidresolveConflict(CDOObject conflict, CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas) voidresolveConflicts(Set<CDOObject> conflicts) Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.protected voidunhookTransaction(CDOTransaction transaction) Methods 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
-
ThreeWayMerge
public ThreeWayMerge()
-
-
Method Details
-
isValid
Description copied from interface:CDOAdapterPolicyReturnstrueif the given adapter on the given object should trigger a certain operation or behavior,falseotherwise.- Specified by:
isValidin interfaceCDOAdapterPolicy- See Also:
-
hookTransaction
- Overrides:
hookTransactionin classAbstractConflictResolver
-
unhookTransaction
- Overrides:
unhookTransactionin classAbstractConflictResolver
-
resolveConflicts
Description copied from interface:CDOConflictResolverResolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.- Specified by:
resolveConflictsin interfaceCDOConflictResolver- Overrides:
resolveConflictsin classAbstractObjectConflictResolver
-
resolveConflict
protected void resolveConflict(CDOObject conflict, CDORevision oldRemoteRevision, CDORevisionDelta localDelta, CDORevisionDelta remoteDelta, List<CDORevisionDelta> allRemoteDeltas) Description copied from class:AbstractObjectConflictResolverResolves the conflict of a single object in the current transaction. Depending on the decision taken to resolve the conflict, it may be necessary to adjust the notification that will be sent to the adapters in the current transaction. This can be achieved by adjusting theCDORevisionDeltaindeltas.- Overrides:
resolveConflictin classAbstractObjectConflictResolver
-
resolveConflict
protected abstract void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas)
-