public abstract static class AbstractObjectConflictResolver.ThreeWayMerge extends AbstractObjectConflictResolver implements CDOAdapterPolicy
| Modifier and Type | Class and Description |
|---|---|
static class |
AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector
If the meaning of this type isn't clear, there really should be more of a description here...
|
AbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMergeCDOConflictResolver.NonConflictAwareALL, CDO, NONE| Constructor and Description |
|---|
ThreeWayMerge() |
| Modifier and Type | Method and Description |
|---|---|
protected void |
hookTransaction(CDOTransaction transaction) |
boolean |
isValid(EObject object,
Adapter adapter)
Returns
true if the given adapter on the given object should trigger a certain operation or behavior,
false otherwise. |
protected void |
resolveConflict(CDOObject conflict,
CDORevision oldRemoteRevision,
CDORevisionDelta localDelta,
CDORevisionDelta remoteDelta,
java.util.List<CDORevisionDelta> allRemoteDeltas)
Resolves the conflict of a single object in the current transaction.
|
protected abstract void |
resolveConflict(CDOObject conflict,
CDORevisionDelta localDelta,
java.util.List<CDORevisionDelta> remoteDeltas) |
void |
resolveConflicts(java.util.Set<CDOObject> conflicts)
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
|
protected void |
unhookTransaction(CDOTransaction transaction) |
changeObject, readObject, resolveConflict, resolveConflicts, rollbackObjectgetTransaction, setTransactionclone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, waitgetTransaction, setTransactionpublic boolean isValid(EObject object, Adapter adapter)
CDOAdapterPolicytrue if the given adapter on the given object should trigger a certain operation or behavior,
false otherwise.isValid in interface CDOAdapterPolicyCDOView.Options.addChangeSubscriptionPolicy(CDOAdapterPolicy),
CDOView.Options.setStrongReferencePolicy(CDOAdapterPolicy)protected void hookTransaction(CDOTransaction transaction)
hookTransaction in class AbstractConflictResolverprotected void unhookTransaction(CDOTransaction transaction)
unhookTransaction in class AbstractConflictResolverpublic void resolveConflicts(java.util.Set<CDOObject> conflicts)
CDOConflictResolverresolveConflicts in interface CDOConflictResolverresolveConflicts in class AbstractObjectConflictResolverprotected void resolveConflict(CDOObject conflict, CDORevision oldRemoteRevision, CDORevisionDelta localDelta, CDORevisionDelta remoteDelta, java.util.List<CDORevisionDelta> allRemoteDeltas)
AbstractObjectConflictResolverCDORevisionDelta in deltas.resolveConflict in class AbstractObjectConflictResolverprotected abstract void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, java.util.List<CDORevisionDelta> remoteDeltas)
Copyright (c) 2004-2019 Eike Stepper (Loehne, Germany) and others.
All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html