- 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
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
-
-
Constructor Summary
Constructors Constructor and Description CDOMergingConflictResolver()CDOMergingConflictResolver(CDOMerger merger)CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference)
-
Method Summary
Methods Modifier and Type Method and Description CDOMergergetMerger()voidresolveConflicts(Set<CDOObject> conflicts)Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.-
Methods inherited from class org.eclipse.emf.spi.cdo.AbstractChangeSetsConflictResolver
getLocalChangeSet, getLocalChangeSetData, getRemoteChangeSet, getRemoteChangeSetData, hookTransaction, unhookTransaction
-
Methods inherited from class org.eclipse.emf.spi.cdo.AbstractConflictResolver
getTransaction, setTransaction
-
-
-
-
Constructor Detail
-
CDOMergingConflictResolver
public CDOMergingConflictResolver(CDOMerger merger)
-
CDOMergingConflictResolver
public CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference)
- Since:
- 4.2
-
CDOMergingConflictResolver
public CDOMergingConflictResolver()
-
-
Method Detail
-
getMerger
public CDOMerger getMerger()
-
resolveConflicts
public void resolveConflicts(Set<CDOObject> conflicts)
Description copied from interface:CDOConflictResolverResolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
-
-