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 AbstractObjectConflictResolver.MergeLocalChangesPerFeature

java.lang.Object
  extended by org.eclipse.emf.spi.cdo.AbstractConflictResolver
      extended by org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver
          extended by org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMerge
              extended by org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.MergeLocalChangesPerFeature
All Implemented Interfaces:
CDOConflictResolver, CDOConflictResolver2, CDOAdapterPolicy
Enclosing class:
AbstractObjectConflictResolver
Deprecated. As of 4.0 use CDOMergingConflictResolver 

@Deprecated
public static class AbstractObjectConflictResolver.MergeLocalChangesPerFeature
  
extends AbstractObjectConflictResolver.ThreeWayMerge

Since:
2.0

Nested Class Summary
 
Nested classes/interfaces inherited from class org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMerge
AbstractObjectConflictResolver.ThreeWayMerge.RevisionDeltaCollector
 
Nested classes/interfaces inherited from class org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver
AbstractObjectConflictResolver.MergeLocalChangesPerFeature, AbstractObjectConflictResolver.TakeRemoteChangesThenApplyLocalChanges, AbstractObjectConflictResolver.ThreeWayMerge
 
Field Summary
 
Fields inherited from interface org.eclipse.emf.cdo.view.CDOAdapterPolicy
ALL, CDO, NONE
 
Constructor Summary
AbstractObjectConflictResolver.MergeLocalChangesPerFeature()
          Deprecated.  
 
Method Summary
protected  boolean hasFeatureConflicts(CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas)
          Deprecated.  
protected  void resolveConflict(CDOObject conflict, CDORevisionDelta localDelta, List<CDORevisionDelta> remoteDeltas)
          Deprecated.  
 
Methods inherited from class org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver.ThreeWayMerge
hookTransaction, isValid, resolveConflict, resolveConflicts, unhookTransaction
 
Methods inherited from class org.eclipse.emf.spi.cdo.AbstractObjectConflictResolver
changeObject, readObject, resolveConflict, resolveConflicts, rollbackObject
 
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
 
Methods inherited from interface org.eclipse.emf.cdo.transaction.CDOConflictResolver
getTransaction, setTransaction
 

Constructor Detail

AbstractObjectConflictResolver.MergeLocalChangesPerFeature

public AbstractObjectConflictResolver.MergeLocalChangesPerFeature()
Deprecated. 
Method Detail

resolveConflict

protected void resolveConflict(CDOObject conflict,
                               CDORevisionDelta localDelta,
                               List<CDORevisionDelta> remoteDeltas)
Deprecated. 
Specified by:
resolveConflict in class AbstractObjectConflictResolver.ThreeWayMerge

hasFeatureConflicts

protected boolean hasFeatureConflicts(CDORevisionDelta localDelta,
                                      List<CDORevisionDelta> remoteDeltas)
Deprecated. 
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.