CDOConflictResolver (CDO Model Repository Documentation)

All Known Subinterfaces:: CDOConflictResolver.NonConflictAware, CDOConflictResolver2, CDOConflictResolver3

All Known Implementing Classes:: AbstractChangeSetsConflictResolver, AbstractConflictResolver, AbstractObjectConflictResolver, AbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMerge, CDOMergingConflictResolver

public interface CDOConflictResolver

A strategy used to customize the default conflict resolution behavior of transactions.

Since:

2.0

Author:

Eike Stepper

See Also:

CDOTransaction.Options.addConflictResolver(CDOConflictResolver)

Nested Class Summary

Nested Classes

Modifier and Type

Interface

Description

static interface

CDOConflictResolver.NonConflictAware

A mix-in interface for conflict resolvers that need to know about non-conflicting invalidations.
Method Summary

Modifier and Type

Method

Description

CDOTransaction

getTransaction()

Returns the transaction this conflict resolver is associated with.

void

resolveConflicts(Set<CDOObject> conflicts)

Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.

void

setTransaction(CDOTransaction transaction)

Sets the transaction this conflict resolver is to be associated with.

Method Details
- getTransaction
  
  CDOTransaction getTransaction()
  
  Returns the transaction this conflict resolver is associated with.
- setTransaction
  
  void setTransaction(CDOTransaction transaction)
  
  Sets the transaction this conflict resolver is to be associated with.
- resolveConflicts
  
  void resolveConflicts(Set<CDOObject> conflicts)
  
  Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.