@Deprecated public static class AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges extends AbstractObjectConflictResolver
AbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMerge
|Constructor and Description|
|Modifier and Type||Method and Description|
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
changeObject, readObject, resolveConflict, resolveConflict, resolveConflicts, rollbackObject
getTransaction, hookTransaction, setTransaction, unhookTransaction
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
public void resolveConflicts(Map<CDOObject,Pair<CDORevision,CDORevisionDelta>> conflicts, List<CDORevisionDelta> allRemoteDeltas)
Depending on the decisions taken to resolve the conflict, it may be necessary to adjust the notifications that will
be sent to the adapters in the current transaction. This can be achieved by adjusting the
conflicts- A map that contains the local objects with conflicts as the keys. Each value in this map is a
pairthat optionally contains the old local revision (ancestor) as element1 and the remote delta as element2. Any of the pair elements can be
nullif it is not possible to determine it locally (depends on local revision caching and server behavior regarding transmission of deltas instead of invalidations).
Copyright (c) 2011-2014 Eike Stepper (Berlin, Germany) and others.