Package 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,DefaultCDOMerger.PerFeature.ManyValuedOld
- Enclosing class:
- DefaultCDOMerger
If the meaning of this type isn't clear, there really should be more of a description here...
- Author:
- Eike Stepper
-
Nested Class Summary
Nested ClassesModifier and TypeClassDescriptionstatic classIf the meaning of this type isn't clear, there really should be more of a description here...static classIf 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.ResolutionPreferenceNested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOMerger
CDOMerger.ConflictException -
Constructor Summary
Constructors -
Method Summary
Modifier and TypeMethodDescriptionprotected 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, getListOrdering, getResolutionPreference, getResult, getSourceMap, getTargetMap, merge, merge
-
Constructor Details
-
PerFeature
public PerFeature() -
PerFeature
- Since:
- 4.2
-
-
Method Details
-
changedInSourceAndTarget
protected Object changedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta) - Overrides:
changedInSourceAndTargetin classDefaultCDOMerger
-
changedInTarget
- Returns:
- the result feature delta, or
nullto ignore the change.
-
changedInSource
- 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.
-