Package org.eclipse.emf.spi.cdo
Class AbstractObjectConflictResolver.MergeLocalChangesPerFeature
- java.lang.Object
- 
- org.eclipse.emf.spi.cdo.AbstractConflictResolver
- 
- org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver
- 
- org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMerge
- 
- org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.MergeLocalChangesPerFeature
 
 
 
 
- 
- All Implemented Interfaces:
- CDOConflictResolver,- CDOConflictResolver2,- CDOAdapterPolicy
 - Enclosing class:
- AbstractObjectConflictResolver
 
 @Deprecated public static class AbstractObjectConflictResolver.MergeLocalChangesPerFeature extends AbstractObjectConflictResolver.ThreeWayMerge Deprecated.As of 4.0 use CDOMergingConflictResolverIf the meaning of this type isn't clear, there really should be more of a description here...- Since:
- 2.0
- Author:
- Eike Stepper
 
- 
- 
Nested Class Summary- 
Nested classes/interfaces inherited from class org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMergeAbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector
 - 
Nested classes/interfaces inherited from class org.eclipse.emf.spi.cdo.AbstractObjectConflictResolverAbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMerge
 - 
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolverCDOConflictResolver.NonConflictAware
 
- 
 - 
Field Summary- 
Fields inherited from interface org.eclipse.emf.cdo.view.CDOAdapterPolicyALL, CDO, NONE
 
- 
 - 
Constructor SummaryConstructors Constructor Description MergeLocalChangesPerFeature()Deprecated.
 - 
Method SummaryAll Methods Instance Methods Concrete Methods Deprecated Methods Modifier and Type Method Description protected booleanhasFeatureConflicts(CDORevisionDelta localDelta, java.util.List<CDORevisionDelta> remoteDeltas)Deprecated.protected voidresolveConflict(CDOObject conflict, CDORevisionDelta localDelta, java.util.List<CDORevisionDelta> remoteDeltas)Deprecated.- 
Methods inherited from class org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMergehookTransaction, isValid, resolveConflict, resolveConflicts, unhookTransaction
 - 
Methods inherited from class org.eclipse.emf.spi.cdo.AbstractObjectConflictResolverchangeObject, readObject, resolveConflict, resolveConflicts, rollbackObject
 - 
Methods inherited from class org.eclipse.emf.spi.cdo.AbstractConflictResolvergetTransaction, setTransaction
 - 
Methods inherited from class java.lang.Objectclone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 - 
Methods inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolvergetTransaction, setTransaction
 
- 
 
- 
- 
- 
Method Detail- 
resolveConflictprotected void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, java.util.List<CDORevisionDelta> remoteDeltas) Deprecated.- Specified by:
- resolveConflictin class- AbstractObjectConflictResolver.ThreeWayMerge
 
 - 
hasFeatureConflictsprotected boolean hasFeatureConflicts(CDORevisionDelta localDelta, java.util.List<CDORevisionDelta> remoteDeltas) Deprecated.
 
- 
 
-