|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Object org.eclipse.emf.spi.cdo.DefaultCDOMerger
If the meaning of this type isn't clear, there really should be more of a description here...
Nested Class Summary | |
---|---|
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 . |
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOMerger |
---|
CDOMerger.ConflictException |
Constructor Summary | |
---|---|
DefaultCDOMerger()
|
|
DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference)
|
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
public DefaultCDOMerger()
public DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference)
Method Detail |
---|
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 boolean merge(Object targetData, Object sourceData)
protected Object addedInTarget(CDORevision revision)
protected Object addedInSource(CDORevision revision)
protected Object addedInSourceAndTarget(CDORevision targetRevision, CDORevision sourceRevision)
protected Object changedInTarget(CDORevisionDelta delta)
protected Object detachedInTarget(CDOID id)
protected Object changedInSource(CDORevisionDelta delta)
protected Object detachedInSource(CDOID id)
protected Object detachedInSourceAndTarget(CDOID id)
protected Object changedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)
protected Object changedInSourceAndDetachedInTarget(CDORevisionDelta sourceDelta)
protected Object changedInTargetAndDetachedInSource(CDORevisionDelta targetDelta)
protected Map<CDOID,Object> getTargetMap()
protected Map<CDOID,Object> getSourceMap()
|
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | ||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |