public class CDOMergingConflictResolver extends AbstractChangeSetsConflictResolver
Constructor and Description |
---|
CDOMergingConflictResolver() |
CDOMergingConflictResolver(CDOMerger merger) |
CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference) |
Modifier and Type | Method and Description |
---|---|
CDOMerger |
getMerger() |
void |
resolveConflicts(Set<CDOObject> conflicts)
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
|
getLocalChangeSet, getLocalChangeSetData, getRemoteChangeSet, getRemoteChangeSetData, hookTransaction, unhookTransaction
getTransaction, setTransaction
public CDOMergingConflictResolver(CDOMerger merger)
public CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference)
public CDOMergingConflictResolver()
public CDOMerger getMerger()
public void resolveConflicts(Set<CDOObject> conflicts)
CDOConflictResolver
Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.