Package org.eclipse.emf.cdo.transaction
Interface CDOMerger2
- All Superinterfaces:
CDOMerger
Merges the changes between a local
transaction and a remote view
into the local transaction. Only the changes of a set of affected objects,
specified by the set of their ids, is considered.- Since:
- 4.5
- Author:
- Eike Stepper
-
Nested Class Summary
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOMerger
CDOMerger.ConflictException -
Method Summary
Modifier and TypeMethodDescriptionmerge(CDOChangeSet target, CDOChangeSet source) Deprecated.voidmerge(CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs) Merges the affected objects from a remote view into a local transaction.
-
Method Details
-
merge
@Deprecated CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source) throws UnsupportedOperationException Deprecated.Description copied from interface:CDOMergerCalculates the changes between a sourcechange setand a targetchange setand returns the result relative to their common ancestor.- Specified by:
mergein interfaceCDOMerger- Throws:
UnsupportedOperationException- No Reference
- This method is not intended to be referenced by clients.
-
merge
void merge(CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs) throws CDOMerger.ConflictException Merges the affected objects from a remote view into a local transaction.- Parameters:
localTransaction- the transaction to update.remoteView- the view supplying the remote changes.affectedIDs- the IDs whose changes are to be merged.- Throws:
CDOMerger.ConflictException- if the changes cannot be merged without conflicts.
-