Overview  Package   Class  Use  Tree  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 DefaultCDOMerger.PerFeature

java.lang.Object
  extended by org.eclipse.emf.spi.cdo.DefaultCDOMerger
      extended by org.eclipse.emf.spi.cdo.DefaultCDOMerger.PerFeature
All Implemented Interfaces:
CDOMerger
Direct Known Subclasses:
DefaultCDOMerger.PerFeature.ManyValued
Enclosing class:
DefaultCDOMerger
public static class DefaultCDOMerger.PerFeature
extends DefaultCDOMerger

Author:
Eike Stepper

Nested Class Summary
static class DefaultCDOMerger.PerFeature.ManyValued
           
 
Nested classes/interfaces inherited from class org.eclipse.emf.spi.cdo.DefaultCDOMerger
DefaultCDOMerger.ChangedInSourceAndDetachedInTargetConflict, DefaultCDOMerger.ChangedInSourceAndTargetConflict, DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict, DefaultCDOMerger.Conflict, DefaultCDOMerger.PerFeature
 
Nested classes/interfaces inherited from interface org.eclipse.emf.cdo.transaction.CDOMerger
CDOMerger.ConflictException
 
Constructor Summary
DefaultCDOMerger.PerFeature()
           
 
Method Summary
protected  CDOFeatureDelta changedInSource(CDOFeatureDelta featureDelta)
           
protected  CDOFeatureDelta changedInSourceAndTarget(CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
           
protected  Object changedInSourceAndTarget(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)
           
protected  CDOFeatureDelta changedInSourceAndTargetManyValued(EStructuralFeature feature, CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
           
protected  CDOFeatureDelta changedInSourceAndTargetSingleValued(EStructuralFeature feature, CDOFeatureDelta targetFeatureDelta, CDOFeatureDelta sourceFeatureDelta)
           
protected  CDOFeatureDelta changedInTarget(CDOFeatureDelta featureDelta)
           
 
Methods inherited from class org.eclipse.emf.spi.cdo.DefaultCDOMerger
addedInSource, addedInSourceAndTarget, addedInTarget, changedInSource, changedInSourceAndDetachedInTarget, changedInTarget, changedInTargetAndDetachedInSource, detachedInSource, detachedInSourceAndTarget, detachedInTarget, getConflicts, getResult, getSourceMap, getTargetMap, merge, merge
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 

Constructor Detail

DefaultCDOMerger.PerFeature

public DefaultCDOMerger.PerFeature()
Method Detail

changedInSourceAndTarget

protected Object changedInSourceAndTarget(CDORevisionDelta targetDelta,
                                          CDORevisionDelta sourceDelta)
Overrides:
changedInSourceAndTarget in class DefaultCDOMerger

changedInTarget

protected CDOFeatureDelta changedInTarget(CDOFeatureDelta featureDelta)
Returns:
the result feature delta, or null to ignore the change.

changedInSource

protected CDOFeatureDelta changedInSource(CDOFeatureDelta featureDelta)
Returns:
the result feature delta, or null to ignore the change.

changedInSourceAndTarget

protected CDOFeatureDelta changedInSourceAndTarget(CDOFeatureDelta targetFeatureDelta,
                                                   CDOFeatureDelta sourceFeatureDelta)
Returns:
the result feature delta, or null to indicate an unresolved conflict.

changedInSourceAndTargetManyValued

protected CDOFeatureDelta changedInSourceAndTargetManyValued(EStructuralFeature feature,
                                                             CDOFeatureDelta targetFeatureDelta,
                                                             CDOFeatureDelta sourceFeatureDelta)
Returns:
the result feature delta, or null to indicate an unresolved conflict.

changedInSourceAndTargetSingleValued

protected CDOFeatureDelta changedInSourceAndTargetSingleValued(EStructuralFeature feature,
                                                               CDOFeatureDelta targetFeatureDelta,
                                                               CDOFeatureDelta sourceFeatureDelta)
Returns:
the result feature delta, or null to indicate an unresolved conflict.
Overview  Package   Class  Use  Tree  Deprecated  Index  Help 
 PREV CLASS   NEXT CLASS FRAMES    NO FRAMES    
SUMMARY: NESTED | FIELD | CONSTR | METHOD DETAIL: FIELD | CONSTR | METHOD
Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.