org.eclipse.emf.spi.cdo
Class CDOMergingConflictResolver

java.lang.Object
  extended by org.eclipse.emf.spi.cdo.AbstractConflictResolver
      extended by org.eclipse.emf.spi.cdo.AbstractChangeSetsConflictResolver
          extended by 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
CDOMergingConflictResolver()
           
CDOMergingConflictResolver(CDOMerger merger)
           
CDOMergingConflictResolver(DefaultCDOMerger.ResolutionPreference resolutionPreference)
           
 
Method Summary
 CDOMerger getMerger()
           
 void resolveConflicts(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
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 

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: 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.