org.eclipse.emf.spi.cdo
Class DefaultCDOMerger

java.lang.Object
  extended by org.eclipse.emf.spi.cdo.DefaultCDOMerger
All Implemented Interfaces:
CDOMerger
Direct Known Subclasses:
DefaultCDOMerger.PerFeature

public class DefaultCDOMerger
extends Object
implements CDOMerger

Since:
3.0
Author:
Eike Stepper

Nested Class Summary
static class DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict
           
static class DefaultCDOMerger.ChangedInSourceAndTargetConflict
           
static class DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict
           
static class DefaultCDOMerger.Conflict
           
static class DefaultCDOMerger.PerFeature
           
 
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOMerger
CDOMerger.ConflictException
 
Constructor Summary
DefaultCDOMerger()
           
 
Method Summary
protected  Object addedInSource(CDORevision revision)
           
protected  Object addedInSourceAndTarget(CDORevision targetRevision, CDORevision sourceRevision)
           
protected  Object addedInTarget(CDORevision revision)
           
protected  Object changedInSource(CDORevisionDelta delta)
           
protected  Object changedInSourceAndDetachedInTarget(CDORevisionDelta sourceDelta)
           
protected  Object changedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)
           
protected  Object changedInTarget(CDORevisionDelta delta)
           
protected  Object changedInTargetAndDetachedInSource(CDORevisionDelta targetDelta)
           
protected  Object detachedInSource(CDOID id)
           
protected  Object detachedInSourceAndTarget(CDOID id)
           
protected  Object detachedInTarget(CDOID id)
           
 Map<CDOID,DefaultCDOMerger.Conflict> getConflicts()
           
 CDOChangeSetData getResult()
           
protected  Map<CDOID,Object> getSourceMap()
           
protected  Map<CDOID,Object> getTargetMap()
           
 CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source)
          Calculates the changes between a source change set and a target change set and returns the result relative to their common ancestor.
protected  boolean merge(Object targetData, Object sourceData)
           
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 

Constructor Detail

DefaultCDOMerger

public DefaultCDOMerger()
Method Detail

getResult

public CDOChangeSetData getResult()

getConflicts

public Map<CDOID,DefaultCDOMerger.Conflict> getConflicts()

merge

public CDOChangeSetData merge(CDOChangeSet target,
                              CDOChangeSet source)
                       throws CDOMerger.ConflictException
Description copied from interface: CDOMerger
Calculates the changes between a source change set and a target change set and returns the result relative to their common ancestor.

Specified by:
merge in interface CDOMerger
Throws:
CDOMerger.ConflictException

merge

protected boolean merge(Object targetData,
                        Object sourceData)

addedInTarget

protected Object addedInTarget(CDORevision revision)

addedInSource

protected Object addedInSource(CDORevision revision)

addedInSourceAndTarget

protected Object addedInSourceAndTarget(CDORevision targetRevision,
                                        CDORevision sourceRevision)

changedInTarget

protected Object changedInTarget(CDORevisionDelta delta)

detachedInTarget

protected Object detachedInTarget(CDOID id)

changedInSource

protected Object changedInSource(CDORevisionDelta delta)

detachedInSource

protected Object detachedInSource(CDOID id)

detachedInSourceAndTarget

protected Object detachedInSourceAndTarget(CDOID id)

changedInSourceAndTarget

protected Object changedInSourceAndTarget(CDORevisionDelta targetDelta,
                                          CDORevisionDelta sourceDelta)

changedInSourceAndDetachedInTarget

protected Object changedInSourceAndDetachedInTarget(CDORevisionDelta sourceDelta)

changedInTargetAndDetachedInSource

protected Object changedInTargetAndDetachedInSource(CDORevisionDelta targetDelta)

getTargetMap

protected Map<CDOID,Object> getTargetMap()

getSourceMap

protected Map<CDOID,Object> getSourceMap()


Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.