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