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
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.CDOConflictResolver
CDOConflictResolver.NonConflictAware
-
Constructor Summary
ConstructorDescriptionCDOMergingConflictResolver
(boolean ensureRemoteNotifications) CDOMergingConflictResolver
(CDOMerger merger) CDOMergingConflictResolver
(CDOMerger merger, boolean ensureRemoteNotifications) CDOMergingConflictResolver
(DefaultCDOMerger.ResolutionPreference resolutionPreference) CDOMergingConflictResolver
(DefaultCDOMerger.ResolutionPreference resolutionPreference, boolean ensureRemoteNotifications) -
Method Summary
Modifier and TypeMethodDescriptionlong
protected CDOChangeSetData
handleConflict
(CDOChangeSetData result) protected void
hookTransaction
(CDOTransaction transaction) boolean
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
Methods inherited from class org.eclipse.emf.spi.cdo.AbstractChangeSetsConflictResolver
getLocalChangeSet, getLocalChangeSetData, getRemoteChangeSet, getRemoteChangeSetData, getRemoteTimeStamp, handleNonConflict, transactionAttachingObject, transactionCommitting, transactionDetachingObject, transactionModifyingObject, unhookTransaction
Methods inherited from class org.eclipse.emf.spi.cdo.AbstractConflictResolver
getTransaction, setTransaction
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
Methods inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolver
getTransaction, setTransaction
-
Constructor Details
-
CDOMergingConflictResolver
-
CDOMergingConflictResolver
- Parameters:
ensureRemoteNotifications
- boolean to disable the use ofCDOAdapterPolicy
to ensure remote changes reception for conflict resolution, true by default. Can be disabled to limit network traffic whenCDOCommonSession.Options.PassiveUpdateMode
is enabled and inCDOCommonSession.Options.PassiveUpdateMode.CHANGES
orCDOCommonSession.Options.PassiveUpdateMode.ADDITIONS
- Since:
- 4.4
-
CDOMergingConflictResolver
- Since:
- 4.2
-
CDOMergingConflictResolver
public CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference, boolean ensureRemoteNotifications) - Parameters:
ensureRemoteNotifications
- boolean to disable the use ofCDOAdapterPolicy
to ensure remote changes reception for conflict resolution, true by default. Can be disabled to limit network traffic whenCDOCommonSession.Options.PassiveUpdateMode
is enabled and inCDOCommonSession.Options.PassiveUpdateMode.CHANGES
orCDOCommonSession.Options.PassiveUpdateMode.ADDITIONS
- Since:
- 4.4
-
CDOMergingConflictResolver
public CDOMergingConflictResolver()- Since:
- 4.4
-
CDOMergingConflictResolver
public CDOMergingConflictResolver(boolean ensureRemoteNotifications) - Parameters:
ensureRemoteNotifications
- boolean to disable the use ofCDOAdapterPolicy
to ensure remote changes reception for conflict resolution, true by default. Can be disabled to limit network traffic whenCDOCommonSession.Options.PassiveUpdateMode
is enabled and inCDOCommonSession.Options.PassiveUpdateMode.CHANGES
orCDOCommonSession.Options.PassiveUpdateMode.ADDITIONS
- Since:
- 4.4
-
-
Method Details
-
getMerger
-
getLastNonConflictTimeStamp
public long getLastNonConflictTimeStamp()- Since:
- 4.4
-
isConflict
public boolean isConflict()- Since:
- 4.4
-
resolveConflicts
Description copied from interface:CDOConflictResolver
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached. -
resolveConflicts
- Since:
- 4.4
-
handleConflict
- Since:
- 4.4
-
hookTransaction
- Overrides:
hookTransaction
in classAbstractChangeSetsConflictResolver
-
transactionCommitted
- Overrides:
transactionCommitted
in classAbstractChangeSetsConflictResolver
-
transactionRolledBack
protected void transactionRolledBack()- Overrides:
transactionRolledBack
in classAbstractChangeSetsConflictResolver
-