public static class DefaultCDOMerger.PerFeature.ManyValued extends DefaultCDOMerger.PerFeature
DefaultCDOMerger.PerFeature.ManyValued, DefaultCDOMerger.PerFeature.ManyValuedOld
DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict, DefaultCDOMerger.ChangedInSourceAndTargetConflict, DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict, DefaultCDOMerger.Conflict, DefaultCDOMerger.PerFeature, DefaultCDOMerger.ResolutionPreference
CDOMerger.ConflictException
Constructor and Description |
---|
ManyValued() |
ManyValued(DefaultCDOMerger.ResolutionPreference resolutionPreference) |
Modifier and Type | Method and Description |
---|---|
protected CDOFeatureDelta |
changedInSourceAndTargetManyValued(EStructuralFeature feature,
CDOFeatureDelta targetFeatureDelta,
CDOFeatureDelta sourceFeatureDelta) |
protected boolean |
treatAsUnique(EStructuralFeature feature) |
changedInSource, changedInSourceAndTarget, changedInSourceAndTarget, changedInSourceAndTargetSingleValued, changedInTarget
addedInSource, addedInSourceAndTarget, addedInTarget, changedInSource, changedInSourceAndDetachedInTarget, changedInTarget, changedInTargetAndDetachedInSource, detachedInSource, detachedInSourceAndTarget, detachedInTarget, getConflicts, getListOrdering, getResolutionPreference, getResult, getSourceMap, getTargetMap, merge, merge
public ManyValued()
public 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.Copyright (c) 2004-2019 Eike Stepper (Loehne, Germany) and others.
All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html