public static class DefaultCDOMerger.ChangedInSourceAndTargetConflict extends DefaultCDOMerger.Conflict
Constructor and Description |
---|
DefaultCDOMerger.ChangedInSourceAndTargetConflict(CDORevisionDelta targetDelta,
CDORevisionDelta sourceDelta) |
Modifier and Type | Method and Description |
---|---|
CDOID |
getID() |
CDORevisionDelta |
getSourceDelta() |
CDORevisionDelta |
getTargetDelta() |
String |
toString() |
public DefaultCDOMerger.ChangedInSourceAndTargetConflict(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)
public CDOID getID()
getID
in class DefaultCDOMerger.Conflict
public CDORevisionDelta getTargetDelta()
public CDORevisionDelta getSourceDelta()
Copyright (c) 2011-2014 Eike Stepper (Berlin, Germany) and others.