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.RevisionDeltaCollectorVon Klasse geerbte verschachtelte Klassen/Schnittstellen org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver
AbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMergeVon 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 -
Methodenübersicht
Modifizierer und TypMethodeBeschreibungprotected booleanhasFeatureConflicts(CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas) Veraltet.protected voidresolveConflict(CDOObject conflict, CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas) Veraltet.Von Klasse geerbte Methoden org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMerge
hookTransaction, isValid, resolveConflict, resolveConflicts, unhookTransactionVon Klasse geerbte Methoden org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver
changeObject, readObject, resolveConflict, resolveConflicts, rollbackObjectVon Klasse geerbte Methoden org.eclipse.emf.spi.cdo.AbstractConflictResolver
getTransaction, setTransactionVon Klasse geerbte Methoden java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, waitVon 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:
resolveConflictin KlasseAbstractObjectConflictResolver.ThreeWayMerge
-
hasFeatureConflicts
protected boolean hasFeatureConflicts(CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas) Veraltet.
-