java.lang.Object

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

org.eclipse.emf.spi.cdo.DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict

Enclosing class:: DefaultCDOMerger

public static class DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict extends DefaultCDOMerger.Conflict

Conflict raised when the target changes an object that the source detached. The target delta preserves the local work that would otherwise be lost by accepting the source detachment.

Author:: Eike Stepper

Constructor Summary

Constructors

Constructor

Description

ChangedInTargetAndDetachedInSourceConflict(CDORevisionDelta targetDelta)
Method Summary

Modifier and Type

Method

Description

CDOID

getID()

CDORevisionDelta

getTargetDelta()

String

toString()

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

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

Class DefaultCDOMerger.ChangedInTargetAndDetachedInSourceConflict

Constructor Summary

Method Summary

Methods inherited from class java.lang.Object

Constructor Details

ChangedInTargetAndDetachedInSourceConflict

Method Details

getID

getTargetDelta

toString