public abstract static class AbstractObjectConflictResolver.ThreeWayMerge extends AbstractObjectConflictResolver implements CDOAdapterPolicy
Modifier and Type | Class and Description |
---|---|
static class |
AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector
If the meaning of this type isn't clear, there really should be more of a description here...
|
AbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMerge
CDOConflictResolver.NonConflictAware
ALL, CDO, NONE
Constructor and Description |
---|
ThreeWayMerge() |
Modifier and Type | Method and Description |
---|---|
protected void |
hookTransaction(CDOTransaction transaction) |
boolean |
isValid(EObject object,
Adapter adapter)
Returns
true if the given adapter on the given object should trigger a certain operation or behaviour,
false otherwise. |
protected void |
resolveConflict(CDOObject conflict,
CDORevision oldRemoteRevision,
CDORevisionDelta localDelta,
CDORevisionDelta remoteDelta,
List<CDORevisionDelta> allRemoteDeltas)
Resolves the conflict of a single object in the current transaction.
|
protected abstract void |
resolveConflict(CDOObject conflict,
CDORevisionDelta localDelta,
List<CDORevisionDelta> remoteDeltas) |
void |
resolveConflicts(Set<CDOObject> conflicts)
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
|
protected void |
unhookTransaction(CDOTransaction transaction) |
changeObject, readObject, resolveConflict, resolveConflicts, rollbackObject
getTransaction, setTransaction
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
getTransaction, setTransaction
public boolean isValid(EObject object, Adapter adapter)
CDOAdapterPolicy
true
if the given adapter on the given object should trigger a certain operation or behaviour,
false
otherwise.isValid
in interface CDOAdapterPolicy
CDOView.Options.addChangeSubscriptionPolicy(CDOAdapterPolicy)
,
CDOView.Options.setStrongReferencePolicy(CDOAdapterPolicy)
protected void hookTransaction(CDOTransaction transaction)
hookTransaction
in class AbstractConflictResolver
protected void unhookTransaction(CDOTransaction transaction)
unhookTransaction
in class AbstractConflictResolver
public void resolveConflicts(Set<CDOObject> conflicts)
CDOConflictResolver
resolveConflicts
in interface CDOConflictResolver
resolveConflicts
in class AbstractObjectConflictResolver
protected void resolveConflict(CDOObject conflict, CDORevision oldRemoteRevision, CDORevisionDelta localDelta, CDORevisionDelta remoteDelta, List<CDORevisionDelta> allRemoteDeltas)
AbstractObjectConflictResolver
CDORevisionDelta
in deltas
.resolveConflict
in class AbstractObjectConflictResolver
protected abstract void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas)
Copyright (c) 2011-2014 Eike Stepper (Berlin, Germany) and others.