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