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 SummaryNested Classes Modifier and Type Class Description static classAbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollectorIf 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.AbstractObjectConflictResolverAbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMerge
 - 
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolverCDOConflictResolver.NonConflictAware
 
- 
 - 
Field Summary- 
Fields inherited from interface org.eclipse.emf.cdo.view.CDOAdapterPolicyALL, CDO, NONE
 
- 
 - 
Constructor SummaryConstructors Constructor Description ThreeWayMerge()
 - 
Method SummaryAll Methods Instance Methods Abstract Methods Concrete Methods Modifier and Type Method Description protected voidhookTransaction(CDOTransaction transaction)booleanisValid(org.eclipse.emf.ecore.EObject object, org.eclipse.emf.common.notify.Adapter adapter)Returnstrueif 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, java.util.List<CDORevisionDelta> allRemoteDeltas)Resolves the conflict of a single object in the current transaction.protected abstract voidresolveConflict(CDOObject conflict, CDORevisionDelta localDelta, java.util.List<CDORevisionDelta> remoteDeltas)voidresolveConflicts(java.util.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.AbstractObjectConflictResolverchangeObject, readObject, resolveConflict, resolveConflicts, rollbackObject
 - 
Methods inherited from class org.eclipse.emf.spi.cdo.AbstractConflictResolvergetTransaction, setTransaction
 - 
Methods inherited from class java.lang.Objectclone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 - 
Methods inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolvergetTransaction, setTransaction
 
- 
 
- 
- 
- 
Method Detail- 
isValidpublic boolean isValid(org.eclipse.emf.ecore.EObject object, org.eclipse.emf.common.notify.Adapter adapter)Description copied from interface:CDOAdapterPolicyReturnstrueif the given adapter on the given object should trigger a certain operation or behavior,falseotherwise.- Specified by:
- isValidin interface- CDOAdapterPolicy
- See Also:
- CDOView.Options.addChangeSubscriptionPolicy(CDOAdapterPolicy),- CDOView.Options.setStrongReferencePolicy(CDOAdapterPolicy)
 
 - 
hookTransactionprotected void hookTransaction(CDOTransaction transaction) - Overrides:
- hookTransactionin class- AbstractConflictResolver
 
 - 
unhookTransactionprotected void unhookTransaction(CDOTransaction transaction) - Overrides:
- unhookTransactionin class- AbstractConflictResolver
 
 - 
resolveConflictspublic void resolveConflicts(java.util.Set<CDOObject> conflicts) Description copied from interface:CDOConflictResolverResolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.- Specified by:
- resolveConflictsin interface- CDOConflictResolver
- Overrides:
- resolveConflictsin class- AbstractObjectConflictResolver
 
 - 
resolveConflictprotected void resolveConflict(CDOObject conflict, CDORevision oldRemoteRevision, CDORevisionDelta localDelta, CDORevisionDelta remoteDelta, java.util.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 class- AbstractObjectConflictResolver
 
 - 
resolveConflictprotected abstract void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, java.util.List<CDORevisionDelta> remoteDeltas) 
 
- 
 
-