Overview  Package   Class  Use  Deprecated  Index  Help 
 PREV CLASS   NEXT CLASS FRAMES    NO FRAMES    
SUMMARY: NESTED | FIELD | CONSTR | METHOD DETAIL: FIELD | CONSTR | METHOD

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
Deprecated. This conflict resolver is still under development. It's not safe to use it. 

@Deprecated
public class CDOMergingConflictResolver
  
extends AbstractChangeSetsConflictResolver

Since:
4.0

Constructor Summary
CDOMergingConflictResolver()
          Deprecated.  
CDOMergingConflictResolver(CDOMerger merger)
          Deprecated.  
 
Method Summary
 CDOMerger getMerger()
          Deprecated.  
 void resolveConflicts(Set<CDOObject> conflicts)
          Deprecated. 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()
Deprecated. 

CDOMergingConflictResolver

public CDOMergingConflictResolver(CDOMerger merger)
Deprecated. 
Method Detail

getMerger

public CDOMerger getMerger()
Deprecated. 

resolveConflicts

public void resolveConflicts(Set<CDOObject> conflicts)
Deprecated. 
Description copied from interface: CDOConflictResolver
Resolves conflicts after remote invalidations arrived for objects that are locally dirty or detached.

Overview  Package   Class  Use  Deprecated  Index  Help 
 PREV CLASS   NEXT CLASS FRAMES    NO FRAMES    
SUMMARY: NESTED | FIELD | CONSTR | METHOD DETAIL: FIELD | CONSTR | METHOD
Copyright (c) 2004 - 2012 Eike Stepper (Berlin, Germany) and others.