Package org.eclipse.emf.cdo.spi.server
Class ICommitConflictResolver.Merging
- java.lang.Object
-
- org.eclipse.emf.cdo.spi.server.ICommitConflictResolver.Merging
-
- All Implemented Interfaces:
ICommitConflictResolver
- Enclosing interface:
- ICommitConflictResolver
public static class ICommitConflictResolver.Merging extends java.lang.Object implements ICommitConflictResolver
- Author:
- Eike Stepper
-
-
Nested Class Summary
-
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.spi.server.ICommitConflictResolver
ICommitConflictResolver.Merging
-
-
Constructor Summary
Constructors Constructor Description Merging()
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description protected CDOMergercreateMerger()CDOChangeSetDataresolveConflicts(IStoreAccessor.CommitContext commitContext, java.util.List<InternalCDORevisionDelta> conflicts)When this method is called, theIStoreAccessor.CommitContext.getOldRevisions()map is filled with the latest valid revisions, chunks ensured.
-
-
-
Method Detail
-
resolveConflicts
public CDOChangeSetData resolveConflicts(IStoreAccessor.CommitContext commitContext, java.util.List<InternalCDORevisionDelta> conflicts)
Description copied from interface:ICommitConflictResolverWhen this method is called, theIStoreAccessor.CommitContext.getOldRevisions()map is filled with the latest valid revisions, chunks ensured.- Specified by:
resolveConflictsin interfaceICommitConflictResolver
-
createMerger
protected CDOMerger createMerger()
-
-