public class DefaultCDOMerger extends Object implements CDOMerger
Modifier and Type | Class and Description |
---|---|
static class |
DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
DefaultCDOMerger.ChangedInSourceAndTargetConflict
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
DefaultCDOMerger.Conflict
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
DefaultCDOMerger.PerFeature
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
DefaultCDOMerger.ResolutionPreference
Enumerates the possible resolution preferences that can be used with a
DefaultCDOMerger . |
CDOMerger.ConflictException
Constructor and Description |
---|
DefaultCDOMerger() |
DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference) |
public DefaultCDOMerger()
public DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference)
public final DefaultCDOMerger.ResolutionPreference getResolutionPreference()
public CDOChangeSetData getResult()
public Map<CDOID,DefaultCDOMerger.Conflict> getConflicts()
public CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source) throws CDOMerger.ConflictException
CDOMerger
change set
and a target change
set
and returns the result relative to their common ancestor.merge
in interface CDOMerger
CDOMerger.ConflictException
protected Object addedInTarget(CDORevision revision)
protected Object addedInSource(CDORevision revision)
protected Object addedInSourceAndTarget(CDORevision targetRevision, CDORevision sourceRevision)
protected Object changedInTarget(CDORevisionDelta delta)
protected Object changedInSource(CDORevisionDelta delta)
protected Object changedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)
protected Object changedInSourceAndDetachedInTarget(CDORevisionDelta sourceDelta)
protected Object changedInTargetAndDetachedInSource(CDORevisionDelta targetDelta)
Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.