org.eclipse.emf.spi.cdo
Class DefaultCDOMerger.PerFeature
java.lang.Object
org.eclipse.emf.spi.cdo.DefaultCDOMerger
org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature
- All Implemented Interfaces:
- CDOMerger
- Direct Known Subclasses:
- DefaultCDOMerger.PerFeature.ManyValued
- Enclosing class:
- DefaultCDOMerger
- public static class DefaultCDOMerger.PerFeature
- extends DefaultCDOMerger
Methods inherited from class org.eclipse.emf.spi.cdo.DefaultCDOMerger |
addedInSource, addedInSourceAndTarget, addedInTarget, changedInSource, changedInSourceAndDetachedInTarget, changedInTarget, changedInTargetAndDetachedInSource, detachedInSource, detachedInSourceAndTarget, detachedInTarget, getConflicts, getResult, getSourceMap, getTargetMap, merge, merge |
Methods inherited from class java.lang.Object |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
DefaultCDOMerger.PerFeature
public DefaultCDOMerger.PerFeature()
changedInSourceAndTarget
protected Object changedInSourceAndTarget(CDORevisionDelta targetDelta,
CDORevisionDelta sourceDelta)
- Overrides:
changedInSourceAndTarget
in class DefaultCDOMerger
changedInTarget
protected CDOFeatureDelta changedInTarget(CDOFeatureDelta featureDelta)
- Returns:
- the result feature delta, or
null
to ignore the change.
changedInSource
protected CDOFeatureDelta changedInSource(CDOFeatureDelta featureDelta)
- Returns:
- the result feature delta, or
null
to ignore the change.
changedInSourceAndTarget
protected CDOFeatureDelta changedInSourceAndTarget(CDOFeatureDelta targetFeatureDelta,
CDOFeatureDelta sourceFeatureDelta)
- Returns:
- the result feature delta, or
null
to indicate an unresolved conflict.
changedInSourceAndTargetManyValued
protected CDOFeatureDelta changedInSourceAndTargetManyValued(EStructuralFeature feature,
CDOFeatureDelta targetFeatureDelta,
CDOFeatureDelta sourceFeatureDelta)
- Returns:
- the result feature delta, or
null
to indicate an unresolved conflict.
changedInSourceAndTargetSingleValued
protected CDOFeatureDelta changedInSourceAndTargetSingleValued(EStructuralFeature feature,
CDOFeatureDelta targetFeatureDelta,
CDOFeatureDelta sourceFeatureDelta)
- Returns:
- the result feature delta, or
null
to indicate an unresolved conflict.
Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.