Package | Description |
---|---|
org.eclipse.emf.cdo | |
org.eclipse.emf.cdo.common.protocol |
Common concepts for dealing with protocols and CDO-specific I/O.
|
org.eclipse.emf.cdo.common.revision |
Common concepts for dealing with revisions and revision lists.
|
org.eclipse.emf.cdo.common.revision.delta |
Common concepts for dealing with revision deltas and feature deltas.
|
org.eclipse.emf.cdo.security.impl |
The generated EMF implementation of the CDO security model.
|
org.eclipse.emf.cdo.spi.common.protocol |
Common base implementations for dealing with I/O of CDO data structures.
|
org.eclipse.emf.cdo.spi.common.revision |
Common service provider interfaces and useful base implementations for dealing with revisions and deltas.
|
org.eclipse.emf.cdo.spi.server |
Server service provider interfaces and useful base implementations.
|
org.eclipse.emf.cdo.transaction |
Client concepts for dealing with transactions, distributed transactions and their save points.
|
org.eclipse.emf.cdo.view |
Client concepts for dealing with views, view sets, queries, CDO objects and EMF resource sets.
|
org.eclipse.emf.spi.cdo |
Client service provider interfaces and useful base implementations.
|
Modifier and Type | Method and Description |
---|---|
CDORevisionDelta |
CDODeltaNotification.getRevisionDelta()
Returns the
CDORevisionDelta associated with this notification. |
Modifier and Type | Method and Description |
---|---|
CDORevisionDelta |
CDODataInput.readCDORevisionDelta() |
Modifier and Type | Method and Description |
---|---|
void |
CDODataOutput.writeCDORevisionDelta(CDORevisionDelta revisionDelta) |
Modifier and Type | Method and Description |
---|---|
CDORevisionDelta |
CDORevision.compare(CDORevision origin) |
static CDORevisionDelta |
CDORevisionUtil.createDelta(CDORevision revision) |
Modifier and Type | Method and Description |
---|---|
void |
CDORevision.merge(CDORevisionDelta delta) |
Modifier and Type | Field and Description |
---|---|
static CDORevisionDelta |
CDORevisionDelta.DETACHED
This constant is only passed into conflict resolvers to indicate that a conflict was caused by remote detachment of
an object.
|
Modifier and Type | Method and Description |
---|---|
CDORevisionDelta |
CDORevisionDelta.copy() |
CDORevisionDelta |
CDORevisionDeltaProvider.getRevisionDelta(CDOID id) |
Modifier and Type | Method and Description |
---|---|
CDORevisionDelta[] |
PermissionImpl.CommitImpactContext.getDirtyObjectDeltas()
Returns the revision deltas of the changed objects of the current commit.
|
Modifier and Type | Method and Description |
---|---|
CDORevisionDelta |
CDODataInputImpl.readCDORevisionDelta() |
Modifier and Type | Method and Description |
---|---|
void |
CDODataOutputImpl.writeCDORevisionDelta(CDORevisionDelta revisionDelta) |
Modifier and Type | Interface and Description |
---|---|
interface |
InternalCDORevisionDelta
If the meaning of this type isn't clear, there really should be more of a description here...
|
Modifier and Type | Method and Description |
---|---|
void |
BaseCDORevision.merge(CDORevisionDelta delta) |
void |
DelegatingCDORevision.merge(CDORevisionDelta delta) |
void |
StubCDORevision.merge(CDORevisionDelta delta) |
void |
CDORevisionMerger.merge(InternalCDORevision revision,
CDORevisionDelta delta) |
Modifier and Type | Method and Description |
---|---|
void |
InternalView.changeTarget(CDOBranchPoint branchPoint,
List<CDOID> invalidObjects,
List<CDORevisionDelta> allChangedObjects,
List<CDOID> allDetachedObjects) |
Modifier and Type | Method and Description |
---|---|
Map<CDOID,CDORevisionDelta> |
CDOSavepoint.getAllRevisionDeltas()
Return the list of all deltas without objects that are removed.
|
Map<CDOID,CDORevisionDelta> |
CDOCommitContext.getRevisionDeltas()
Returns a map of the
revision deltas that are to be committed with this commit context. |
Map<CDOID,CDORevisionDelta> |
CDOPushTransaction.getRevisionDeltas() |
ConcurrentMap<CDOID,CDORevisionDelta> |
CDOSavepoint.getRevisionDeltas()
Deprecated.
As of 4.2 use
CDOSavepoint.getRevisionDeltas2() instead. |
Map<CDOID,CDORevisionDelta> |
CDOTransaction.getRevisionDeltas() |
Map<CDOID,CDORevisionDelta> |
CDOSavepoint.getRevisionDeltas2() |
Modifier and Type | Method and Description |
---|---|
void |
CDOConflictResolver2.resolveConflicts(Map<CDOObject,Pair<CDORevision,CDORevisionDelta>> conflicts,
List<CDORevisionDelta> allRemoteDeltas)
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
|
void |
CDOConflictResolver2.resolveConflicts(Map<CDOObject,Pair<CDORevision,CDORevisionDelta>> conflicts,
List<CDORevisionDelta> allRemoteDeltas)
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
|
Modifier and Type | Method and Description |
---|---|
Map<CDOObject,CDORevisionDelta> |
CDOViewInvalidationEvent.getRevisionDeltas()
Returns a map with the
change deltas per object. |
Modifier and Type | Method and Description |
---|---|
CDORevisionDelta |
DefaultCDOMerger.ChangedInSourceAndTargetConflict.getSourceDelta() |
CDORevisionDelta |
DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict.getSourceDelta() |
CDORevisionDelta |
DefaultCDOMerger.ChangedInSourceAndTargetConflict.getTargetDelta() |
CDORevisionDelta |
DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict.getTargetDelta() |
Modifier and Type | Method and Description |
---|---|
List<CDORevisionDelta> |
AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector.getDeltas(CDOObject notifier) |
Modifier and Type | Method and Description |
---|---|
protected Object |
DefaultCDOMerger.changedInSource(CDORevisionDelta delta) |
protected Object |
DefaultCDOMerger.changedInSourceAndDetachedInTarget(CDORevisionDelta sourceDelta) |
protected Object |
DefaultCDOMerger.changedInSourceAndTarget(CDORevisionDelta targetDelta,
CDORevisionDelta sourceDelta) |
protected Object |
DefaultCDOMerger.PerFeature.changedInSourceAndTarget(CDORevisionDelta targetDelta,
CDORevisionDelta sourceDelta) |
protected Object |
DefaultCDOMerger.changedInTarget(CDORevisionDelta delta) |
protected Object |
DefaultCDOMerger.changedInTargetAndDetachedInSource(CDORevisionDelta targetDelta) |
static void |
AbstractObjectConflictResolver.changeObject(CDOObject object,
CDORevisionDelta revisionDelta)
TODO See
CDOObjectMerger !!! |
void |
InternalCDOView.clearResourcePathCacheIfNecessary(CDORevisionDelta delta) |
protected boolean |
AbstractObjectConflictResolver.MergeLocalChangesPerFeature.hasFeatureConflicts(CDORevisionDelta localDelta,
List<CDORevisionDelta> remoteDeltas)
Deprecated.
|
void |
InternalCDOTransaction.registerRevisionDelta(CDORevisionDelta revisionDelta) |
protected void |
AbstractObjectConflictResolver.resolveConflict(CDOObject conflict,
CDORevision oldRemoteRevision,
CDORevisionDelta localDelta,
CDORevisionDelta remoteDelta,
List<CDORevisionDelta> allRemoteDeltas)
Resolves the conflict of a single object in the current transaction.
|
protected void |
AbstractObjectConflictResolver.ThreeWayMerge.resolveConflict(CDOObject conflict,
CDORevision oldRemoteRevision,
CDORevisionDelta localDelta,
CDORevisionDelta remoteDelta,
List<CDORevisionDelta> allRemoteDeltas) |
protected void |
AbstractObjectConflictResolver.resolveConflict(CDOObject conflict,
CDORevisionDelta localDelta)
Resolves the conflict of a single object in the current transaction.
|
protected abstract void |
AbstractObjectConflictResolver.ThreeWayMerge.resolveConflict(CDOObject conflict,
CDORevisionDelta localDelta,
List<CDORevisionDelta> remoteDeltas) |
protected void |
AbstractObjectConflictResolver.MergeLocalChangesPerFeature.resolveConflict(CDOObject conflict,
CDORevisionDelta localDelta,
List<CDORevisionDelta> remoteDeltas)
Deprecated.
|
Modifier and Type | Method and Description |
---|---|
protected boolean |
AbstractObjectConflictResolver.MergeLocalChangesPerFeature.hasFeatureConflicts(CDORevisionDelta localDelta,
List<CDORevisionDelta> remoteDeltas)
Deprecated.
|
protected void |
AbstractObjectConflictResolver.resolveConflict(CDOObject conflict,
CDORevision oldRemoteRevision,
CDORevisionDelta localDelta,
CDORevisionDelta remoteDelta,
List<CDORevisionDelta> allRemoteDeltas)
Resolves the conflict of a single object in the current transaction.
|
protected void |
AbstractObjectConflictResolver.ThreeWayMerge.resolveConflict(CDOObject conflict,
CDORevision oldRemoteRevision,
CDORevisionDelta localDelta,
CDORevisionDelta remoteDelta,
List<CDORevisionDelta> allRemoteDeltas) |
protected abstract void |
AbstractObjectConflictResolver.ThreeWayMerge.resolveConflict(CDOObject conflict,
CDORevisionDelta localDelta,
List<CDORevisionDelta> remoteDeltas) |
protected void |
AbstractObjectConflictResolver.MergeLocalChangesPerFeature.resolveConflict(CDOObject conflict,
CDORevisionDelta localDelta,
List<CDORevisionDelta> remoteDeltas)
Deprecated.
|
void |
AbstractObjectConflictResolver.resolveConflicts(Map<CDOObject,Pair<CDORevision,CDORevisionDelta>> conflicts,
List<CDORevisionDelta> allRemoteDeltas) |
void |
AbstractObjectConflictResolver.resolveConflicts(Map<CDOObject,Pair<CDORevision,CDORevisionDelta>> conflicts,
List<CDORevisionDelta> allRemoteDeltas) |
void |
AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges.resolveConflicts(Map<CDOObject,Pair<CDORevision,CDORevisionDelta>> conflicts,
List<CDORevisionDelta> allRemoteDeltas)
Deprecated.
|
void |
AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges.resolveConflicts(Map<CDOObject,Pair<CDORevision,CDORevisionDelta>> conflicts,
List<CDORevisionDelta> allRemoteDeltas)
Deprecated.
|
Constructor and Description |
---|
ChangedInSourceAndDetachedInTargetConflict(CDORevisionDelta sourceDelta) |
ChangedInSourceAndTargetConflict(CDORevisionDelta targetDelta,
CDORevisionDelta sourceDelta) |
ChangedInTargetAndDetachedInSourceConflict(CDORevisionDelta targetDelta) |
Copyright (c) 2014 Eike Stepper (Berlin, 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