Package org.eclipse.emf.spi.cdo
Class DefaultCDOMerger.ChangedInSourceAndTargetConflict
- 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
If the meaning of this type isn't clear, there really should be more of a description here...- Author:
- Eike Stepper
-
-
Constructor Summary
Constructors Constructor Description ChangedInSourceAndTargetConflict(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description CDOIDgetID()CDORevisionDeltagetSourceDelta()CDORevisionDeltagetTargetDelta()java.lang.StringtoString()
-
-
-
Constructor Detail
-
ChangedInSourceAndTargetConflict
public ChangedInSourceAndTargetConflict(CDORevisionDelta targetDelta, CDORevisionDelta sourceDelta)
-
-
Method Detail
-
getID
public CDOID getID()
- Specified by:
getIDin classDefaultCDOMerger.Conflict
-
getTargetDelta
public CDORevisionDelta getTargetDelta()
-
getSourceDelta
public CDORevisionDelta getSourceDelta()
-
toString
public java.lang.String toString()
- Overrides:
toStringin classjava.lang.Object
-
-