Package org.eclipse.emf.cdo.transaction
Interface CDOConflictResolver2
- All Superinterfaces:
CDOConflictResolver
- All Known Implementing Classes:
AbstractObjectConflictResolver,AbstractObjectConflictResolver.MergeLocalChangesPerFeature,AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges,AbstractObjectConflictResolver.ThreeWayMerge
A strategy used to customize the default conflict resolution behavior of
transactions.- Since:
- 4.0
- Author:
- Eike Stepper
-
Nested Class Summary
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolver
CDOConflictResolver.NonConflictAware -
Method Summary
Modifier and TypeMethodDescriptionvoidresolveConflicts(Map<CDOObject, org.eclipse.net4j.util.collection.Pair<CDORevision, CDORevisionDelta>> conflicts, List<CDORevisionDelta> allRemoteDeltas) Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.Methods inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolver
getTransaction, resolveConflicts, setTransaction
-
Method Details
-
resolveConflicts
void resolveConflicts(Map<CDOObject, org.eclipse.net4j.util.collection.Pair<CDORevision, CDORevisionDelta>> conflicts, List<CDORevisionDelta> allRemoteDeltas) Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.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
CDORevisionDeltaindeltas.- Parameters:
conflicts- A map that contains the local objects with conflicts as the keys. Each value in this map is apairthat optionally contains the old local revision (ancestor) as element1 and the remote delta as element2. Any of the pair elements can benullif it is not possible to determine it locally (depends on local revision caching and server behavior regarding transmission of deltas instead of invalidations).
-