Package org.eclipse.emf.spi.cdo

# Klasse AbstractObjectConflictResolver.MergeLocalChangesPerFeature

java.lang.Object
org.eclipse.emf.spi.cdo.AbstractConflictResolver
org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver
org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMerge
org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.MergeLocalChangesPerFeature

Alle implementierten Schnittstellen:
  `CDOConflictResolver`, `CDOConflictResolver2`, `CDOAdapterPolicy`

Umschließende Klasse:
  `AbstractObjectConflictResolver`

@Deprecated public static class AbstractObjectConflictResolver.MergeLocalChangesPerFeature extends AbstractObjectConflictResolver.ThreeWayMerge
Veraltet.
As of 4.0 use CDOMergingConflictResolver
If the meaning of this type isn't clear, there really should be more of a description here...

Seit:
  2.0
Autor:
  Eike Stepper

## Verschachtelte Klassen - Übersicht

## Von Klasse geerbte verschachtelte Klassen/Schnittstellen org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMerge

`AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector`

## Von Klasse geerbte verschachtelte Klassen/Schnittstellen org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver

`AbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMerge`

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

`CDOConflictResolver.NonConflictAware`

## Feldübersicht

### Von Schnittstelle geerbte Felder org.eclipse.emf.cdo.view.CDOAdapterPolicy

`ALL, CDO, NONE`

## Konstruktorübersicht

Konstruktoren
Konstruktor
Beschreibung
`MergeLocalChangesPerFeature()`
Veraltet.

## Methodenübersicht

Modifizierer und Typ
Methode
Beschreibung
`protected boolean`
`hasFeatureConflicts(CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas)`
Veraltet.
`protected void`
`resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas)`
Veraltet.

### Von Klasse geerbte Methoden org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMerge

`hookTransaction, isValid, resolveConflict, resolveConflicts, unhookTransaction`

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

`changeObject, readObject, resolveConflict, resolveConflicts, rollbackObject`

### 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

### MergeLocalChangesPerFeature

public MergeLocalChangesPerFeature()
Veraltet.

## Methodendetails

### resolveConflict

protected void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas)
Veraltet.

Angegeben von:
  `resolveConflict` in Klasse `AbstractObjectConflictResolver.ThreeWayMerge`

### hasFeatureConflicts

protected boolean hasFeatureConflicts(CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas)
Veraltet.