Package org.eclipse.emf.cdo.transaction

# Schnittstelle CDOConflictResolver2

Alle Superschnittstellen:
  `CDOConflictResolver`

Alle bekannten Implementierungsklassen:
  `AbstractObjectConflictResolver`, `AbstractObjectConflictResolver.MergeLocalChangesPerFeature`, `AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges`, `AbstractObjectConflictResolver.ThreeWayMerge`

public interface CDOConflictResolver2 extends CDOConflictResolver
A strategy used to customize the default conflict resolution behavior of `transactions`.

Seit:
  4.0
Autor:
  Eike Stepper

## Verschachtelte Klassen - Übersicht

## Von Schnittstelle geerbte verschachtelte Klassen/Schnittstellen org.eclipse.emf.cdo.transaction.CDOConflictResolver

`CDOConflictResolver.NonConflictAware`

## Methodenübersicht

Modifizierer und Typ
Methode
Beschreibung
`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.

### Von Schnittstelle geerbte Methoden org.eclipse.emf.cdo.transaction.CDOConflictResolver

`getTransaction, resolveConflicts, setTransaction`

## Methodendetails

### 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 `CDORevisionDelta` in `deltas`.

Parameter:
  `conflicts` - A map that contains the local objects with conflicts as the keys. Each value in this map is a `pair` that optionally contains the old local revision (ancestor) as element1 and the remote delta as element2. Any of the pair elements can be `null` if it is not possible to determine it locally (depends on local revision caching and server behavior regarding transmission of deltas instead of invalidations).