- 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
If the meaning of this type isn't clear, there really should be more of a description here...
-
-
Nested Class Summary
Nested Classes Modifier and Type Class and Description static classDefaultCDOMerger.PerFeature.ManyValuedIf the meaning of this type isn't clear, there really should be more of a description here...-
Nested classes/interfaces inherited from class org.eclipse.emf.spi.cdo.DefaultCDOMerger
DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict, DefaultCDOMerger.ChangedInSourceAndTargetConflict, DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict, DefaultCDOMerger.Conflict, DefaultCDOMerger.PerFeature, DefaultCDOMerger.ResolutionPreference
-
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOMerger
CDOMerger.ConflictException
-
-
Constructor Summary
Constructors Constructor and Description DefaultCDOMerger.PerFeature()DefaultCDOMerger.PerFeature(DefaultCDOMerger.ResolutionPreference resolutionPreference)
-
Method Summary
Methods Modifier and Type Method and Description protected CDOFeatureDeltachangedInSource(CDOFeatureDelta featureDelta)protected CDOFeatureDeltachangedInSourceAndTarget(CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)protected ObjectchangedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)protected CDOFeatureDeltachangedInSourceAndTargetManyValued(EStructuralFeature feature, CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)protected CDOFeatureDeltachangedInSourceAndTargetSingleValued(EStructuralFeature feature, CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)protected CDOFeatureDeltachangedInTarget(CDOFeatureDelta featureDelta)-
Methods inherited from class org.eclipse.emf.spi.cdo.DefaultCDOMerger
addedInSource, addedInSourceAndTarget, addedInTarget, changedInSource, changedInSourceAndDetachedInTarget, changedInTarget, changedInTargetAndDetachedInSource, detachedInSource, detachedInSourceAndTarget, detachedInTarget, getConflicts, getResolutionPreference, getResult, getSourceMap, getTargetMap, merge, merge
-
-
-
-
Constructor Detail
-
DefaultCDOMerger.PerFeature
public DefaultCDOMerger.PerFeature()
-
DefaultCDOMerger.PerFeature
public DefaultCDOMerger.PerFeature(DefaultCDOMerger.ResolutionPreference resolutionPreference)
- Since:
- 4.2
-
-
Method Detail
-
changedInSourceAndTarget
protected Object changedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)
- Overrides:
changedInSourceAndTargetin classDefaultCDOMerger
-
changedInTarget
protected CDOFeatureDelta changedInTarget(CDOFeatureDelta featureDelta)
- Returns:
- the result feature delta, or
nullto ignore the change.
-
changedInSource
protected CDOFeatureDelta changedInSource(CDOFeatureDelta featureDelta)
- Returns:
- the result feature delta, or
nullto ignore the change.
-
changedInSourceAndTarget
protected CDOFeatureDelta changedInSourceAndTarget(CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
- Returns:
- the result feature delta, or
nullto indicate an unresolved conflict.
-
changedInSourceAndTargetManyValued
protected CDOFeatureDelta changedInSourceAndTargetManyValued(EStructuralFeature feature, CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
- Returns:
- the result feature delta, or
nullto indicate an unresolved conflict.
-
changedInSourceAndTargetSingleValued
protected CDOFeatureDelta changedInSourceAndTargetSingleValued(EStructuralFeature feature, CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
- Returns:
- the result feature delta, or
nullto indicate an unresolved conflict.
-
-