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
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 Summary
Nested ClassesModifier and TypeClassDescriptionstatic classIf the meaning of this type isn't clear, there really should be more of a description here...static classIf the meaning of this type isn't clear, there really should be more of a description here...static classIf the meaning of this type isn't clear, there really should be more of a description here...static classIf the meaning of this type isn't clear, there really should be more of a description here...static classIf the meaning of this type isn't clear, there really should be more of a description here...static enumEnumerates the possible resolution preferences that can be used with aDefaultCDOMerger.Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOMerger
CDOMerger.ConflictException -
Constructor Summary
ConstructorsConstructorDescriptionDefaultCDOMerger(CDOCommonRepository.ListOrdering listOrdering) DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference) DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference, CDOCommonRepository.ListOrdering listOrdering) -
Method Summary
Modifier and TypeMethodDescriptionprotected ObjectaddedInSource(CDORevision revision) protected ObjectaddedInSourceAndTarget(CDORevision targetRevision, CDORevision sourceRevision) protected ObjectaddedInTarget(CDORevision revision) protected ObjectchangedInSource(CDORevisionDelta delta) protected ObjectchangedInSourceAndDetachedInTarget(CDORevisionDelta sourceDelta) protected ObjectchangedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta) protected ObjectchangedInTarget(CDORevisionDelta delta) protected ObjectchangedInTargetAndDetachedInSource(CDORevisionDelta targetDelta) protected Objectprotected Objectprotected Objectprotected booleanmerge(CDOChangeSet target, CDOChangeSet source) Calculates the changes between a sourcechange setand a targetchange setand returns the result relative to their common ancestor.
-
Constructor Details
-
DefaultCDOMerger
public DefaultCDOMerger() -
DefaultCDOMerger
- Since:
- 4.6
-
DefaultCDOMerger
- Since:
- 4.2
-
DefaultCDOMerger
public DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference, CDOCommonRepository.ListOrdering listOrdering) - Since:
- 4.6
-
-
Method Details
-
getResolutionPreference
- Since:
- 4.2
-
getListOrdering
- Since:
- 4.6
-
getResult
-
getConflicts
-
merge
public 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 interfaceCDOMerger- Throws:
CDOMerger.ConflictException
-
merge
-
addedInTarget
-
addedInSource
-
addedInSourceAndTarget
-
changedInTarget
-
detachedInTarget
-
changedInSource
-
detachedInSource
-
detachedInSourceAndTarget
-
changedInSourceAndTarget
protected Object changedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta) -
changedInSourceAndDetachedInTarget
-
changedInTargetAndDetachedInSource
-
getTargetMap
-
getSourceMap
-