public static class DefaultCDOMerger.PerFeature.ManyValued extends DefaultCDOMerger.PerFeature
Modifier and Type | Class and Description |
---|---|
static class |
DefaultCDOMerger.PerFeature.ManyValued.Element
A virtual list element to establish unique relations between ancestor, source and target sides.
|
static class |
DefaultCDOMerger.PerFeature.ManyValued.PerSide<T>
Holds data for the source and target sides.
|
static class |
DefaultCDOMerger.PerFeature.ManyValued.Side
Enumerates the possible sides of a merge, i.e.,
DefaultCDOMerger.PerFeature.ManyValued.Side.SOURCE and DefaultCDOMerger.PerFeature.ManyValued.Side.TARGET . |
DefaultCDOMerger.PerFeature.ManyValued
DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict, DefaultCDOMerger.ChangedInSourceAndTargetConflict, DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict, DefaultCDOMerger.Conflict, DefaultCDOMerger.PerFeature, DefaultCDOMerger.ResolutionPreference
CDOMerger.ConflictException
Constructor and Description |
---|
DefaultCDOMerger.PerFeature.ManyValued() |
DefaultCDOMerger.PerFeature.ManyValued(DefaultCDOMerger.ResolutionPreference resolutionPreference) |
changedInSource, changedInSourceAndTarget, changedInSourceAndTarget, changedInSourceAndTargetSingleValued, changedInTarget
addedInSource, addedInSourceAndTarget, addedInTarget, changedInSource, changedInSourceAndDetachedInTarget, changedInTarget, changedInTargetAndDetachedInSource, detachedInSource, detachedInSourceAndTarget, detachedInTarget, getConflicts, getResolutionPreference, getResult, getSourceMap, getTargetMap, merge, merge
public DefaultCDOMerger.PerFeature.ManyValued()
public DefaultCDOMerger.PerFeature.ManyValued(DefaultCDOMerger.ResolutionPreference resolutionPreference)
protected boolean treatAsUnique(EStructuralFeature feature)
protected CDOFeatureDelta changedInSourceAndTargetManyValued(EStructuralFeature feature, CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
changedInSourceAndTargetManyValued
in class DefaultCDOMerger.PerFeature
null
to indicate an unresolved conflict.protected static DefaultCDOMerger.PerFeature.ManyValued.Side other(DefaultCDOMerger.PerFeature.ManyValued.Side side)
@Deprecated protected CDOListFeatureDelta createResult(EStructuralFeature feature)
@Deprecated protected void handleListDelta(List<CDOFeatureDelta> resultList, List<CDOFeatureDelta> listToHandle, List<CDOFeatureDelta> listToAdjust)
@Deprecated protected boolean handleListDeltaAdd(List<CDOFeatureDelta> resultList, CDOAddFeatureDelta addDelta, List<CDOFeatureDelta> listToAdjust)
@Deprecated protected boolean handleListDeltaRemove(List<CDOFeatureDelta> resultList, CDORemoveFeatureDelta removeDelta, List<CDOFeatureDelta> listToAdjust)
@Deprecated protected boolean handleListDeltaMove(List<CDOFeatureDelta> resultList, CDOMoveFeatureDelta moveDelta, List<CDOFeatureDelta> listToAdjust)
@Deprecated public static void adjustAfterAddition(List<CDOFeatureDelta> list, int index)
@Deprecated public static void adjustAfterRemoval(List<CDOFeatureDelta> list, int index)
@Deprecated public static void adjustAfterMove(List<CDOFeatureDelta> list, int oldPosition, int newPosition)
Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.