Package org.eclipse.emf.spi.cdo

# Klasse CDOMergingConflictResolver

java.lang.Object
org.eclipse.emf.spi.cdo.AbstractConflictResolver
org.eclipse.emf.spi.cdo.AbstractChangeSetsConflictResolver
org.eclipse.emf.spi.cdo.CDOMergingConflictResolver

Alle implementierten Schnittstellen:
  `CDOConflictResolver`, `CDOConflictResolver.NonConflictAware`

public class CDOMergingConflictResolver extends AbstractChangeSetsConflictResolver
If the meaning of this type isn't clear, there really should be more of a description here...

Seit:
  4.0
Autor:
  Eike Stepper

## Verschachtelte Klassen - Übersicht

## Von Schnittstelle geerbte verschachtelte Klassen/Schnittstellen org.eclipse.emf.cdo.transaction.CDOConflictResolver

`CDOConflictResolver.NonConflictAware`

## Konstruktorübersicht

Konstruktoren
Konstruktor
Beschreibung
`CDOMergingConflictResolver()`
`CDOMergingConflictResolver(boolean ensureRemoteNotifications)`
`CDOMergingConflictResolver(CDOMerger merger)`
`CDOMergingConflictResolver(CDOMerger merger, boolean ensureRemoteNotifications)`
`CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference)`
`CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference, boolean ensureRemoteNotifications)`

## Methodenübersicht

Modifizierer und Typ
Methode
Beschreibung
`long`
`getLastNonConflictTimeStamp()`
`CDOMerger`
`getMerger()`
`protected CDOChangeSetData`
`handleConflict(CDOChangeSetData result)`
`protected void`
`hookTransaction(CDOTransaction transaction)`
`boolean`
`isConflict()`
`void`
`resolveConflicts(Set<CDOObject> conflicts)`
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
`protected void`
`resolveConflicts(Set<CDOObject> conflicts, CDOChangeSet remoteChangeSet)`
`protected void`
`transactionCommitted(CDOCommitContext commitContext)`
`protected void`
`transactionRolledBack()`

### Von Klasse geerbte Methoden org.eclipse.emf.spi.cdo.AbstractChangeSetsConflictResolver

`getLocalChangeSet, getLocalChangeSetData, getRemoteChangeSet, getRemoteChangeSetData, getRemoteTimeStamp, handleNonConflict, transactionAttachingObject, transactionCommitting, transactionDetachingObject, transactionModifyingObject, unhookTransaction`

### Von Klasse geerbte Methoden org.eclipse.emf.spi.cdo.AbstractConflictResolver

`getTransaction, setTransaction`

### Von Klasse geerbte Methoden java.lang.Object

`clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait`

### Von Schnittstelle geerbte Methoden org.eclipse.emf.cdo.transaction.CDOConflictResolver

`getTransaction, setTransaction`

## Konstruktordetails

### CDOMergingConflictResolver

public CDOMergingConflictResolver(CDOMerger merger)

### CDOMergingConflictResolver

public CDOMergingConflictResolver(CDOMerger merger, boolean ensureRemoteNotifications)

Parameter:
  `ensureRemoteNotifications` - boolean to disable the use of `CDOAdapterPolicy` to ensure remote changes reception for conflict resolution, true by default. Can be disabled to limit network traffic when `CDOCommonSession.Options.PassiveUpdateMode` is enabled and in `CDOCommonSession.Options.PassiveUpdateMode.CHANGES` or `CDOCommonSession.Options.PassiveUpdateMode.ADDITIONS`
Seit:
  4.4

### CDOMergingConflictResolver

public CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference)

Seit:
  4.2

### CDOMergingConflictResolver

public CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference, boolean ensureRemoteNotifications)

Parameter:
  `ensureRemoteNotifications` - boolean to disable the use of `CDOAdapterPolicy` to ensure remote changes reception for conflict resolution, true by default. Can be disabled to limit network traffic when `CDOCommonSession.Options.PassiveUpdateMode` is enabled and in `CDOCommonSession.Options.PassiveUpdateMode.CHANGES` or `CDOCommonSession.Options.PassiveUpdateMode.ADDITIONS`
Seit:
  4.4

### CDOMergingConflictResolver

public CDOMergingConflictResolver()

Seit:
  4.4

### CDOMergingConflictResolver

public CDOMergingConflictResolver(boolean ensureRemoteNotifications)

Parameter:
  `ensureRemoteNotifications` - boolean to disable the use of `CDOAdapterPolicy` to ensure remote changes reception for conflict resolution, true by default. Can be disabled to limit network traffic when `CDOCommonSession.Options.PassiveUpdateMode` is enabled and in `CDOCommonSession.Options.PassiveUpdateMode.CHANGES` or `CDOCommonSession.Options.PassiveUpdateMode.ADDITIONS`
Seit:
  4.4

## Methodendetails

### getMerger

public CDOMerger getMerger()

### getLastNonConflictTimeStamp

public long getLastNonConflictTimeStamp()

Seit:
  4.4

### isConflict

public boolean isConflict()

Seit:
  4.4

### resolveConflicts

public void resolveConflicts(Set<CDOObject> conflicts)
Beschreibung aus Schnittstelle kopiert: `CDOConflictResolver`
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.

### resolveConflicts

protected void resolveConflicts(Set<CDOObject> conflicts, CDOChangeSet remoteChangeSet)

Seit:
  4.4

### handleConflict

protected CDOChangeSetData handleConflict(CDOChangeSetData result)

Seit:
  4.4

### hookTransaction

protected void hookTransaction(CDOTransaction transaction)

Setzt außer Kraft:
  `hookTransaction` in Klasse `AbstractChangeSetsConflictResolver`

### transactionCommitted

protected void transactionCommitted(CDOCommitContext commitContext)

Setzt außer Kraft:
  `transactionCommitted` in Klasse `AbstractChangeSetsConflictResolver`

### transactionRolledBack

protected void transactionRolledBack()

Setzt außer Kraft:
  `transactionRolledBack` in Klasse `AbstractChangeSetsConflictResolver`