Package org.eclipse.emf.spi.cdo

# Klasse AbstractObjectConflictResolver

java.lang.Object
org.eclipse.emf.spi.cdo.AbstractConflictResolver
org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver

Alle implementierten Schnittstellen:
  `CDOConflictResolver`, `CDOConflictResolver2`

Bekannte direkte Unterklassen:
  `AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges`, `AbstractObjectConflictResolver.ThreeWayMerge`

public abstract class AbstractObjectConflictResolver extends AbstractConflictResolver implements CDOConflictResolver2
If the meaning of this type isn't clear, there really should be more of a description here...

Seit:
  2.0
Autor:
  Eike Stepper

## Verschachtelte Klassen - Übersicht

Verschachtelte Klassen
Modifizierer und Typ
Klasse
Beschreibung
`static class`
`AbstractObjectConflictResolver.MergeLocalChangesPerFeature`
Veraltet.
As of 4.0 use CDOMergingConflictResolver
`static class`
`AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges`
Veraltet.
`static class`
`AbstractObjectConflictResolver.ThreeWayMerge`
If the meaning of this type isn't clear, there really should be more of a description here...

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

`CDOConflictResolver.NonConflictAware`

## Konstruktorübersicht

Konstruktoren
Konstruktor
Beschreibung
`AbstractObjectConflictResolver()`

## Methodenübersicht

Modifizierer und Typ
Methode
Beschreibung
`static void`
`changeObject(CDOObject object, CDORevisionDelta revisionDelta)`
TODO See `CDOObjectMerger`!!!
`static void`
`readObject(CDOObject object)`
`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 void`
`resolveConflict(CDOObject conflict, CDORevisionDelta localDelta)`
Resolves the conflict of a single object in the current transaction.
`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.
`void`
`resolveConflicts(Set<CDOObject> conflicts)`
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
`static void`
`rollbackObject(CDOObject object)`
Veraltet.
Don't call this method.

### Von Klasse geerbte Methoden org.eclipse.emf.spi.cdo.AbstractConflictResolver

`getTransaction, hookTransaction, setTransaction, unhookTransaction`

### Von Klasse geerbte Methoden java.lang.Object

`clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait`

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

`getTransaction, setTransaction`

## Konstruktordetails

### AbstractObjectConflictResolver

public AbstractObjectConflictResolver()

## Methodendetails

### resolveConflicts

public void resolveConflicts(Set<CDOObject> conflicts)
Beschreibung aus Schnittstelle kopiert: `CDOConflictResolver`
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.

Angegeben von:
  `resolveConflicts` in Schnittstelle `CDOConflictResolver`

### resolveConflict

protected void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta)
Resolves the conflict of a single object in the current transaction.

### resolveConflicts

public void resolveConflicts(Map<CDOObject,org.eclipse.net4j.util.collection.Pair<CDORevision,CDORevisionDelta>> conflicts, List<CDORevisionDelta> allRemoteDeltas)
Beschreibung aus Schnittstelle kopiert: `CDOConflictResolver2`
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`.

Angegeben von:
  `resolveConflicts` in Schnittstelle `CDOConflictResolver2`
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).
Seit:
  4.0

### resolveConflict

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. Depending on the decision taken to resolve the conflict, it may be necessary to adjust the notification that will be sent to the adapters in the current transaction. This can be achieved by adjusting the `CDORevisionDelta` in `deltas`.

Seit:
  4.0

### rollbackObject

@Deprecated public static void rollbackObject(CDOObject object)
Veraltet.
Don't call this method. Rolling back single objects is exremely risky.

### readObject

public static void readObject(CDOObject object)

### changeObject

public static void changeObject(CDOObject object, CDORevisionDelta revisionDelta)
TODO See `CDOObjectMerger`!!!