public abstract class AbstractObjectConflictResolver extends AbstractConflictResolver implements CDOConflictResolver2
Modifier and Type | Class and Description |
---|---|
static class |
AbstractObjectConflictResolver.MergeLocalChangesPerFeature
Deprecated.
As of 4.0 use CDOMergingConflictResolver
|
static class |
AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges
Deprecated.
|
static class |
AbstractObjectConflictResolver.ThreeWayMerge
If the meaning of this type isn't clear, there really should be more of a description here...
|
CDOConflictResolver.NonConflictAware
Constructor and Description |
---|
AbstractObjectConflictResolver() |
Modifier and Type | Method and Description |
---|---|
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,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)
Deprecated.
Don't call this method. Rolling back single objects is exremely risky.
|
getTransaction, hookTransaction, setTransaction, unhookTransaction
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
getTransaction, setTransaction
public void resolveConflicts(Set<CDOObject> conflicts)
CDOConflictResolver
resolveConflicts
in interface CDOConflictResolver
protected void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta)
public void resolveConflicts(Map<CDOObject,Pair<CDORevision,CDORevisionDelta>> conflicts, List<CDORevisionDelta> allRemoteDeltas)
CDOConflictResolver2
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
.
resolveConflicts
in interface CDOConflictResolver2
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 behaviour regarding transmission of deltas instead
of invalidations).protected void resolveConflict(CDOObject conflict, CDORevision oldRemoteRevision, CDORevisionDelta localDelta, CDORevisionDelta remoteDelta, List<CDORevisionDelta> allRemoteDeltas)
CDORevisionDelta
in deltas
.@Deprecated public static void rollbackObject(CDOObject object)
public static void readObject(CDOObject object)
public static void changeObject(CDOObject object, CDORevisionDelta revisionDelta)
CDOObjectMerger
!!!Copyright (c) 2011-2014 Eike Stepper (Berlin, Germany) and others.