public static class DefaultCDOMerger.PerFeature extends DefaultCDOMerger
Modifier and Type | Class and Description |
---|---|
static class |
DefaultCDOMerger.PerFeature.ManyValued
If the meaning of this type isn't clear, there really should be more of a description here...
|
DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict, DefaultCDOMerger.ChangedInSourceAndTargetConflict, DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict, DefaultCDOMerger.Conflict, DefaultCDOMerger.PerFeature, DefaultCDOMerger.ResolutionPreference
CDOMerger.ConflictException
Constructor and Description |
---|
DefaultCDOMerger.PerFeature() |
DefaultCDOMerger.PerFeature(DefaultCDOMerger.ResolutionPreference resolutionPreference) |
Modifier and Type | Method and Description |
---|---|
protected CDOFeatureDelta |
changedInSource(CDOFeatureDelta featureDelta) |
protected CDOFeatureDelta |
changedInSourceAndTarget(CDOFeatureDelta targetFeatureDelta,
CDOFeatureDelta sourceFeatureDelta) |
protected Object |
changedInSourceAndTarget(CDORevisionDelta targetDelta,
CDORevisionDelta sourceDelta) |
protected CDOFeatureDelta |
changedInSourceAndTargetManyValued(org.eclipse.emf.ecore.EStructuralFeature feature,
CDOFeatureDelta targetFeatureDelta,
CDOFeatureDelta sourceFeatureDelta) |
protected CDOFeatureDelta |
changedInSourceAndTargetSingleValued(org.eclipse.emf.ecore.EStructuralFeature feature,
CDOFeatureDelta targetFeatureDelta,
CDOFeatureDelta sourceFeatureDelta) |
protected CDOFeatureDelta |
changedInTarget(CDOFeatureDelta featureDelta) |
addedInSource, addedInSourceAndTarget, addedInTarget, changedInSource, changedInSourceAndDetachedInTarget, changedInTarget, changedInTargetAndDetachedInSource, detachedInSource, detachedInSourceAndTarget, detachedInTarget, getConflicts, getResolutionPreference, getResult, getSourceMap, getTargetMap, merge, merge
public DefaultCDOMerger.PerFeature()
public DefaultCDOMerger.PerFeature(DefaultCDOMerger.ResolutionPreference resolutionPreference)
protected Object changedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)
changedInSourceAndTarget
in class DefaultCDOMerger
protected CDOFeatureDelta changedInTarget(CDOFeatureDelta featureDelta)
null
to ignore the change.protected CDOFeatureDelta changedInSource(CDOFeatureDelta featureDelta)
null
to ignore the change.protected CDOFeatureDelta changedInSourceAndTarget(CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
null
to indicate an unresolved conflict.protected CDOFeatureDelta changedInSourceAndTargetManyValued(org.eclipse.emf.ecore.EStructuralFeature feature, CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
null
to indicate an unresolved conflict.protected CDOFeatureDelta changedInSourceAndTargetSingleValued(org.eclipse.emf.ecore.EStructuralFeature feature, CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
null
to indicate an unresolved conflict.Copyright (c) 2011-2014 Eike Stepper (Berlin, Germany) and others.