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(java.util.Set<CDOObject> conflicts)
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
|
protected void |
resolveConflicts(java.util.Set<CDOObject> conflicts,
CDOChangeSet remoteChangeSet) |
protected void |
transactionCommitted(CDOCommitContext commitContext) |
protected void |
transactionRolledBack() |
getLocalChangeSet, getLocalChangeSetData, getRemoteChangeSet, getRemoteChangeSetData, getRemoteTimeStamp, handleNonConflict, transactionAttachingObject, transactionCommitting, transactionDetachingObject, transactionModifyingObject, unhookTransactiongetTransaction, setTransactionclone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, waitgetTransaction, setTransactionpublic 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.ADDITIONSpublic 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.ADDITIONSpublic 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.ADDITIONSpublic CDOMerger getMerger()
public long getLastNonConflictTimeStamp()
public boolean isConflict()
public void resolveConflicts(java.util.Set<CDOObject> conflicts)
CDOConflictResolverprotected void resolveConflicts(java.util.Set<CDOObject> conflicts, CDOChangeSet remoteChangeSet)
protected CDOChangeSetData handleConflict(CDOChangeSetData result)
protected void hookTransaction(CDOTransaction transaction)
hookTransaction in class AbstractChangeSetsConflictResolverprotected void transactionCommitted(CDOCommitContext commitContext)
transactionCommitted in class AbstractChangeSetsConflictResolverprotected void transactionRolledBack()
transactionRolledBack in class AbstractChangeSetsConflictResolverCopyright (c) 2004-2019 Eike Stepper (Loehne, Germany) and others.
All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html