Package org.eclipse.emf.spi.cdo
Class DefaultCDOMerger
- java.lang.Object
- 
- org.eclipse.emf.spi.cdo.DefaultCDOMerger
 
- 
- All Implemented Interfaces:
- CDOMerger
 - Direct Known Subclasses:
- DefaultCDOMerger.PerFeature
 
 public class DefaultCDOMerger extends java.lang.Object implements CDOMerger If the meaning of this type isn't clear, there really should be more of a description here...- Since:
- 3.0
- Author:
- Eike Stepper
 
- 
- 
Nested Class SummaryNested Classes Modifier and Type Class Description static classDefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflictIf the meaning of this type isn't clear, there really should be more of a description here...static classDefaultCDOMerger.ChangedInSourceAndTargetConflictIf the meaning of this type isn't clear, there really should be more of a description here...static classDefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflictIf the meaning of this type isn't clear, there really should be more of a description here...static classDefaultCDOMerger.ConflictIf the meaning of this type isn't clear, there really should be more of a description here...static classDefaultCDOMerger.PerFeatureIf the meaning of this type isn't clear, there really should be more of a description here...static classDefaultCDOMerger.ResolutionPreferenceEnumerates the possible resolution preferences that can be used with aDefaultCDOMerger.- 
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOMergerCDOMerger.ConflictException
 
- 
 - 
Constructor SummaryConstructors Constructor Description DefaultCDOMerger()DefaultCDOMerger(CDOCommonRepository.ListOrdering listOrdering)DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference)DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference, CDOCommonRepository.ListOrdering listOrdering)
 - 
Method SummaryAll Methods Instance Methods Concrete Methods Modifier and Type Method Description protected java.lang.ObjectaddedInSource(CDORevision revision)protected java.lang.ObjectaddedInSourceAndTarget(CDORevision targetRevision, CDORevision sourceRevision)protected java.lang.ObjectaddedInTarget(CDORevision revision)protected java.lang.ObjectchangedInSource(CDORevisionDelta delta)protected java.lang.ObjectchangedInSourceAndDetachedInTarget(CDORevisionDelta sourceDelta)protected java.lang.ObjectchangedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)protected java.lang.ObjectchangedInTarget(CDORevisionDelta delta)protected java.lang.ObjectchangedInTargetAndDetachedInSource(CDORevisionDelta targetDelta)protected java.lang.ObjectdetachedInSource(CDOID id)protected java.lang.ObjectdetachedInSourceAndTarget(CDOID id)protected java.lang.ObjectdetachedInTarget(CDOID id)java.util.Map<CDOID,DefaultCDOMerger.Conflict>getConflicts()CDOCommonRepository.ListOrderinggetListOrdering()DefaultCDOMerger.ResolutionPreferencegetResolutionPreference()CDOChangeSetDatagetResult()protected java.util.Map<CDOID,java.lang.Object>getSourceMap()protected java.util.Map<CDOID,java.lang.Object>getTargetMap()protected booleanmerge(java.lang.Object targetData, java.lang.Object sourceData)CDOChangeSetDatamerge(CDOChangeSet target, CDOChangeSet source)Calculates the changes between a sourcechange setand a targetchange setand returns the result relative to their common ancestor.
 
- 
- 
- 
Constructor Detail- 
DefaultCDOMergerpublic DefaultCDOMerger() 
 - 
DefaultCDOMergerpublic DefaultCDOMerger(CDOCommonRepository.ListOrdering listOrdering) - Since:
- 4.6
 
 - 
DefaultCDOMergerpublic DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference) - Since:
- 4.2
 
 - 
DefaultCDOMergerpublic DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference, CDOCommonRepository.ListOrdering listOrdering) - Since:
- 4.6
 
 
- 
 - 
Method Detail- 
getResolutionPreferencepublic final DefaultCDOMerger.ResolutionPreference getResolutionPreference() - Since:
- 4.2
 
 - 
getListOrderingpublic CDOCommonRepository.ListOrdering getListOrdering() - Since:
- 4.6
 
 - 
getResultpublic CDOChangeSetData getResult() 
 - 
getConflictspublic java.util.Map<CDOID,DefaultCDOMerger.Conflict> getConflicts() 
 - 
mergepublic CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source) throws CDOMerger.ConflictException Description copied from interface:CDOMergerCalculates the changes between a sourcechange setand a targetchange setand returns the result relative to their common ancestor.- Specified by:
- mergein interface- CDOMerger
- Throws:
- CDOMerger.ConflictException
 
 - 
mergeprotected boolean merge(java.lang.Object targetData, java.lang.Object sourceData)
 - 
addedInTargetprotected java.lang.Object addedInTarget(CDORevision revision) 
 - 
addedInSourceprotected java.lang.Object addedInSource(CDORevision revision) 
 - 
addedInSourceAndTargetprotected java.lang.Object addedInSourceAndTarget(CDORevision targetRevision, CDORevision sourceRevision) 
 - 
changedInTargetprotected java.lang.Object changedInTarget(CDORevisionDelta delta) 
 - 
detachedInTargetprotected java.lang.Object detachedInTarget(CDOID id) 
 - 
changedInSourceprotected java.lang.Object changedInSource(CDORevisionDelta delta) 
 - 
detachedInSourceprotected java.lang.Object detachedInSource(CDOID id) 
 - 
detachedInSourceAndTargetprotected java.lang.Object detachedInSourceAndTarget(CDOID id) 
 - 
changedInSourceAndTargetprotected java.lang.Object changedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta) 
 - 
changedInSourceAndDetachedInTargetprotected java.lang.Object changedInSourceAndDetachedInTarget(CDORevisionDelta sourceDelta) 
 - 
changedInTargetAndDetachedInSourceprotected java.lang.Object changedInTargetAndDetachedInSource(CDORevisionDelta targetDelta) 
 - 
getTargetMapprotected java.util.Map<CDOID,java.lang.Object> getTargetMap() 
 - 
getSourceMapprotected java.util.Map<CDOID,java.lang.Object> getSourceMap() 
 
- 
 
-