java.lang.Object

org.eclipse.emf.spi.cdo.DefaultCDOMerger.Conflict

org.eclipse.emf.spi.cdo.DefaultCDOMerger.ChangedInSourceAndTargetConflict

Enclosing class:: DefaultCDOMerger

public static class DefaultCDOMerger.ChangedInSourceAndTargetConflict extends DefaultCDOMerger.Conflict

Conflict raised when both the target and source change the same object's revision. It retains both revision deltas, which are the competing histories a merger or conflict handler must reconcile.

Author:: Eike Stepper

Constructor Summary

Constructors

Constructor

Description

ChangedInSourceAndTargetConflict(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)
Method Summary

Modifier and Type

Method

Description

CDOID

getID()

CDORevisionDelta

getSourceDelta()

CDORevisionDelta

getTargetDelta()

String

toString()

Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait

Constructor Details
- ChangedInSourceAndTargetConflict
  
  public ChangedInSourceAndTargetConflict(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)
Method Details
- getID
  
  public CDOID getID()
  
  Specified by:
  
  getID in class DefaultCDOMerger.Conflict
- getTargetDelta
  
  public CDORevisionDelta getTargetDelta()
- getSourceDelta
  
  public CDORevisionDelta getSourceDelta()
- toString
  
  public String toString()
  
  Overrides:
  
  toString in class Object

Class DefaultCDOMerger.ChangedInSourceAndTargetConflict

Constructor Summary

Method Summary

Methods inherited from class java.lang.Object

Constructor Details

ChangedInSourceAndTargetConflict

Method Details

getID

getTargetDelta

getSourceDelta

toString