Package org.eclipse.emf.cdo.transaction
Interface CDOConflictResolver2
- 
- All Superinterfaces:
- CDOConflictResolver
 - All Known Implementing Classes:
- AbstractObjectConflictResolver,- AbstractObjectConflictResolver.MergeLocalChangesPerFeature,- AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges,- AbstractObjectConflictResolver.ThreeWayMerge
 
 public interface CDOConflictResolver2 extends CDOConflictResolver A strategy used to customize the default conflict resolution behavior oftransactions.- Since:
- 4.0
- Author:
- Eike Stepper
 
- 
- 
Nested Class Summary- 
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolverCDOConflictResolver.NonConflictAware
 
- 
 - 
Method SummaryAll Methods Instance Methods Abstract Methods Modifier and Type Method Description voidresolveConflicts(java.util.Map<CDOObject,org.eclipse.net4j.util.collection.Pair<CDORevision,CDORevisionDelta>> conflicts, java.util.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.CDOConflictResolvergetTransaction, resolveConflicts, setTransaction
 
- 
 
- 
- 
- 
Method Detail- 
resolveConflictsvoid resolveConflicts(java.util.Map<CDOObject,org.eclipse.net4j.util.collection.Pair<CDORevision,CDORevisionDelta>> conflicts, java.util.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 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).
 
 
- 
 
-