public class CDOMergingConflictResolver extends AbstractChangeSetsConflictResolver
CDOConflictResolver.NonConflictAware
Constructor and Description |
---|
CDOMergingConflictResolver() |
CDOMergingConflictResolver(boolean ensureRemoteNotifications) |
CDOMergingConflictResolver(CDOMerger merger) |
CDOMergingConflictResolver(CDOMerger merger,
boolean ensureRemoteNotifications) |
CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference) |
CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference,
boolean ensureRemoteNotifications) |
Modifier and Type | Method and Description |
---|---|
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() |
getLocalChangeSet, getLocalChangeSetData, getRemoteChangeSet, getRemoteChangeSetData, getRemoteTimeStamp, handleNonConflict, transactionAttachingObject, transactionCommitting, transactionDetachingObject, transactionModifyingObject, unhookTransaction
getTransaction, setTransaction
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
getTransaction, setTransaction
public CDOMergingConflictResolver(CDOMerger merger)
public CDOMergingConflictResolver(CDOMerger merger, boolean ensureRemoteNotifications)
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
public CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference)
public CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference, boolean ensureRemoteNotifications)
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
public CDOMergingConflictResolver()
public CDOMergingConflictResolver(boolean ensureRemoteNotifications)
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
public CDOMerger getMerger()
public long getLastNonConflictTimeStamp()
public boolean isConflict()
public void resolveConflicts(Set<CDOObject> conflicts)
CDOConflictResolver
protected void resolveConflicts(Set<CDOObject> conflicts, CDOChangeSet remoteChangeSet)
protected CDOChangeSetData handleConflict(CDOChangeSetData result)
protected void hookTransaction(CDOTransaction transaction)
hookTransaction
in class AbstractChangeSetsConflictResolver
protected void transactionCommitted(CDOCommitContext commitContext)
transactionCommitted
in class AbstractChangeSetsConflictResolver
protected void transactionRolledBack()
transactionRolledBack
in class AbstractChangeSetsConflictResolver
Copyright (c) 2011-2014 Eike Stepper (Berlin, Germany) and others.