Package org.eclipse.emf.spi.cdo
Class CDOMergingConflictResolver
- java.lang.Object
- 
- org.eclipse.emf.spi.cdo.AbstractConflictResolver
- 
- org.eclipse.emf.spi.cdo.AbstractChangeSetsConflictResolver
- 
- org.eclipse.emf.spi.cdo.CDOMergingConflictResolver
 
 
 
- 
- All Implemented Interfaces:
- 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...- Since:
- 4.0
- Author:
- Eike Stepper
 
- 
- 
Nested Class Summary- 
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolverCDOConflictResolver.NonConflictAware
 
- 
 - 
Constructor SummaryConstructors Constructor Description CDOMergingConflictResolver()CDOMergingConflictResolver(boolean ensureRemoteNotifications)CDOMergingConflictResolver(CDOMerger merger)CDOMergingConflictResolver(CDOMerger merger, boolean ensureRemoteNotifications)CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference)CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference, boolean ensureRemoteNotifications)
 - 
Method SummaryAll Methods Instance Methods Concrete Methods Modifier and Type Method Description longgetLastNonConflictTimeStamp()CDOMergergetMerger()protected CDOChangeSetDatahandleConflict(CDOChangeSetData result)protected voidhookTransaction(CDOTransaction transaction)booleanisConflict()voidresolveConflicts(java.util.Set<CDOObject> conflicts)Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.protected voidresolveConflicts(java.util.Set<CDOObject> conflicts, CDOChangeSet remoteChangeSet)protected voidtransactionCommitted(CDOCommitContext commitContext)protected voidtransactionRolledBack()- 
Methods inherited from class org.eclipse.emf.spi.cdo.AbstractChangeSetsConflictResolvergetLocalChangeSet, getLocalChangeSetData, getRemoteChangeSet, getRemoteChangeSetData, getRemoteTimeStamp, handleNonConflict, transactionAttachingObject, transactionCommitting, transactionDetachingObject, transactionModifyingObject, unhookTransaction
 - 
Methods inherited from class org.eclipse.emf.spi.cdo.AbstractConflictResolvergetTransaction, setTransaction
 - 
Methods inherited from class java.lang.Objectclone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 - 
Methods inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolvergetTransaction, setTransaction
 
- 
 
- 
- 
- 
Constructor Detail- 
CDOMergingConflictResolverpublic CDOMergingConflictResolver(CDOMerger merger) 
 - 
CDOMergingConflictResolverpublic CDOMergingConflictResolver(CDOMerger merger, boolean ensureRemoteNotifications) - Parameters:
- ensureRemoteNotifications- boolean to disable the use of- CDOAdapterPolicyto ensure remote changes reception for conflict resolution, true by default. Can be disabled to limit network traffic when- CDOCommonSession.Options.PassiveUpdateModeis enabled and in- CDOCommonSession.Options.PassiveUpdateMode.CHANGESor- CDOCommonSession.Options.PassiveUpdateMode.ADDITIONS
- Since:
- 4.4
 
 - 
CDOMergingConflictResolverpublic CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference) - Since:
- 4.2
 
 - 
CDOMergingConflictResolverpublic CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference, boolean ensureRemoteNotifications) - Parameters:
- ensureRemoteNotifications- boolean to disable the use of- CDOAdapterPolicyto ensure remote changes reception for conflict resolution, true by default. Can be disabled to limit network traffic when- CDOCommonSession.Options.PassiveUpdateModeis enabled and in- CDOCommonSession.Options.PassiveUpdateMode.CHANGESor- CDOCommonSession.Options.PassiveUpdateMode.ADDITIONS
- Since:
- 4.4
 
 - 
CDOMergingConflictResolverpublic CDOMergingConflictResolver() - Since:
- 4.4
 
 - 
CDOMergingConflictResolverpublic CDOMergingConflictResolver(boolean ensureRemoteNotifications) - Parameters:
- ensureRemoteNotifications- boolean to disable the use of- CDOAdapterPolicyto ensure remote changes reception for conflict resolution, true by default. Can be disabled to limit network traffic when- CDOCommonSession.Options.PassiveUpdateModeis enabled and in- CDOCommonSession.Options.PassiveUpdateMode.CHANGESor- CDOCommonSession.Options.PassiveUpdateMode.ADDITIONS
- Since:
- 4.4
 
 
- 
 - 
Method Detail- 
getMergerpublic CDOMerger getMerger() 
 - 
getLastNonConflictTimeStamppublic long getLastNonConflictTimeStamp() - Since:
- 4.4
 
 - 
isConflictpublic boolean isConflict() - Since:
- 4.4
 
 - 
resolveConflictspublic void resolveConflicts(java.util.Set<CDOObject> conflicts) Description copied from interface:CDOConflictResolverResolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
 - 
resolveConflictsprotected void resolveConflicts(java.util.Set<CDOObject> conflicts, CDOChangeSet remoteChangeSet) - Since:
- 4.4
 
 - 
handleConflictprotected CDOChangeSetData handleConflict(CDOChangeSetData result) - Since:
- 4.4
 
 - 
hookTransactionprotected void hookTransaction(CDOTransaction transaction) - Overrides:
- hookTransactionin class- AbstractChangeSetsConflictResolver
 
 - 
transactionCommittedprotected void transactionCommitted(CDOCommitContext commitContext) - Overrides:
- transactionCommittedin class- AbstractChangeSetsConflictResolver
 
 - 
transactionRolledBackprotected void transactionRolledBack() - Overrides:
- transactionRolledBackin class- AbstractChangeSetsConflictResolver
 
 
- 
 
-