public class DefaultCDOMerger extends java.lang.Object implements CDOMerger
Modifier and Type | Class and Description |
---|---|
static class |
DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
DefaultCDOMerger.ChangedInSourceAndTargetConflict
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
DefaultCDOMerger.Conflict
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
DefaultCDOMerger.PerFeature
If the meaning of this type isn't clear, there really should be more of a description here...
|
static class |
DefaultCDOMerger.ResolutionPreference
Enumerates the possible resolution preferences that can be used with a
DefaultCDOMerger . |
CDOMerger.ConflictException
Constructor and Description |
---|
DefaultCDOMerger() |
DefaultCDOMerger(CDOCommonRepository.ListOrdering listOrdering) |
DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference) |
DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference,
CDOCommonRepository.ListOrdering listOrdering) |
Modifier and Type | Method and Description |
---|---|
protected java.lang.Object |
addedInSource(CDORevision revision) |
protected java.lang.Object |
addedInSourceAndTarget(CDORevision targetRevision,
CDORevision sourceRevision) |
protected java.lang.Object |
addedInTarget(CDORevision revision) |
protected java.lang.Object |
changedInSource(CDORevisionDelta delta) |
protected java.lang.Object |
changedInSourceAndDetachedInTarget(CDORevisionDelta sourceDelta) |
protected java.lang.Object |
changedInSourceAndTarget(CDORevisionDelta targetDelta,
CDORevisionDelta sourceDelta) |
protected java.lang.Object |
changedInTarget(CDORevisionDelta delta) |
protected java.lang.Object |
changedInTargetAndDetachedInSource(CDORevisionDelta targetDelta) |
protected java.lang.Object |
detachedInSource(CDOID id) |
protected java.lang.Object |
detachedInSourceAndTarget(CDOID id) |
protected java.lang.Object |
detachedInTarget(CDOID id) |
java.util.Map<CDOID,DefaultCDOMerger.Conflict> |
getConflicts() |
CDOCommonRepository.ListOrdering |
getListOrdering() |
DefaultCDOMerger.ResolutionPreference |
getResolutionPreference() |
CDOChangeSetData |
getResult() |
protected java.util.Map<CDOID,java.lang.Object> |
getSourceMap() |
protected java.util.Map<CDOID,java.lang.Object> |
getTargetMap() |
CDOChangeSetData |
merge(CDOChangeSet target,
CDOChangeSet source)
Calculates the changes between a source
change set and a target change
set and returns the result relative to their common ancestor. |
protected boolean |
merge(java.lang.Object targetData,
java.lang.Object sourceData) |
public DefaultCDOMerger()
public DefaultCDOMerger(CDOCommonRepository.ListOrdering listOrdering)
public DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference)
public DefaultCDOMerger(DefaultCDOMerger.ResolutionPreference resolutionPreference, CDOCommonRepository.ListOrdering listOrdering)
public final DefaultCDOMerger.ResolutionPreference getResolutionPreference()
public CDOCommonRepository.ListOrdering getListOrdering()
public CDOChangeSetData getResult()
public java.util.Map<CDOID,DefaultCDOMerger.Conflict> getConflicts()
public CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source) throws CDOMerger.ConflictException
CDOMerger
change set
and a target change
set
and returns the result relative to their common ancestor.merge
in interface CDOMerger
CDOMerger.ConflictException
protected boolean merge(java.lang.Object targetData, java.lang.Object sourceData)
protected java.lang.Object addedInTarget(CDORevision revision)
protected java.lang.Object addedInSource(CDORevision revision)
protected java.lang.Object addedInSourceAndTarget(CDORevision targetRevision, CDORevision sourceRevision)
protected java.lang.Object changedInTarget(CDORevisionDelta delta)
protected java.lang.Object detachedInTarget(CDOID id)
protected java.lang.Object changedInSource(CDORevisionDelta delta)
protected java.lang.Object detachedInSource(CDOID id)
protected java.lang.Object detachedInSourceAndTarget(CDOID id)
protected java.lang.Object changedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)
protected java.lang.Object changedInSourceAndDetachedInTarget(CDORevisionDelta sourceDelta)
protected java.lang.Object changedInTargetAndDetachedInSource(CDORevisionDelta targetDelta)
protected java.util.Map<CDOID,java.lang.Object> getTargetMap()
protected java.util.Map<CDOID,java.lang.Object> getSourceMap()
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