@Deprecated public static class AbstractObjectConflictResolver.MergeLocalChangesPerFeature extends AbstractObjectConflictResolver.ThreeWayMerge
AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector
AbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMerge
CDOConflictResolver.NonConflictAware
ALL, CDO, NONE
Constructor and Description |
---|
MergeLocalChangesPerFeature()
Deprecated.
|
Modifier and Type | Method and Description |
---|---|
protected boolean |
hasFeatureConflicts(CDORevisionDelta localDelta,
List<CDORevisionDelta> remoteDeltas)
Deprecated.
|
protected void |
resolveConflict(CDOObject conflict,
CDORevisionDelta localDelta,
List<CDORevisionDelta> remoteDeltas)
Deprecated.
|
hookTransaction, isValid, resolveConflict, resolveConflicts, unhookTransaction
changeObject, readObject, resolveConflict, resolveConflicts, rollbackObject
getTransaction, setTransaction
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
getTransaction, setTransaction
protected void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas)
resolveConflict
in class AbstractObjectConflictResolver.ThreeWayMerge
protected boolean hasFeatureConflicts(CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas)
Copyright (c) 2014 Eike Stepper (Berlin, 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