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
- 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
Methods inherited from class java.lang.Object |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
CDOMergingConflictResolver
public CDOMergingConflictResolver(CDOMerger merger)
CDOMergingConflictResolver
public CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference)
- Since:
- 4.2
CDOMergingConflictResolver
public CDOMergingConflictResolver()
getMerger
public CDOMerger getMerger()
resolveConflicts
public void resolveConflicts(Set<CDOObject> conflicts)
- Description copied from interface:
CDOConflictResolver
- Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.
Copyright (c) 2011, 2012 Eike Stepper (Berlin, Germany) and others.