Class ThreeWayDiff
java.lang.Object
org.eclipse.team.core.diff.provider.Diff
org.eclipse.team.core.diff.provider.ThreeWayDiff
- All Implemented Interfaces:
IDiff,IThreeWayDiff
Implementation of
IThreeWayDiff.- Since:
- 3.2
- Restriction:
- This class is not intended to be subclassed by clients.
-
Field Summary
Fields inherited from interface org.eclipse.team.core.diff.IThreeWayDiff
CONFLICTING, DIRECTION_MASK, INCOMING, OUTGOING -
Constructor Summary
ConstructorsConstructorDescriptionThreeWayDiff(ITwoWayDiff localChange, ITwoWayDiff remoteChange) Create a three-way delta from the two changes. -
Method Summary
Modifier and TypeMethodDescriptionbooleanintReturn the direction of this three-way delta.Return the local change associated with this delta.Return the remote change associated with this delta.Return a string that describes the difference represented by this node.Methods inherited from class org.eclipse.team.core.diff.provider.Diff
getKind, getPath, getStatus, hashCode
-
Constructor Details
-
ThreeWayDiff
Create a three-way delta from the two changes. At least one change must be provided (i.e. either change may benullbut at least one must be non-null).- Parameters:
localChange- the local change in the model object ornullif there is no local changeremoteChange- the remote change in the model object ornullif there is no local change
-
-
Method Details
-
getLocalChange
Description copied from interface:IThreeWayDiffReturn the local change associated with this delta. If there is no local change, either a delta with kindIDiff.NO_CHANGEis returned ornullmay be returned.- Specified by:
getLocalChangein interfaceIThreeWayDiff- Returns:
- the local change associated with this delta or
null
-
getRemoteChange
Description copied from interface:IThreeWayDiffReturn the remote change associated with this delta. If there is no remote change, either a delta with kindIDiff.NO_CHANGEis returned ornullmay be returned.- Specified by:
getRemoteChangein interfaceIThreeWayDiff- Returns:
- the remote change associated with this delta or
null
-
getDirection
public int getDirection()Description copied from interface:IThreeWayDiffReturn the direction of this three-way delta.- Specified by:
getDirectionin interfaceIThreeWayDiff- Returns:
- the direction of this three-way delta
- See Also:
-
toDiffString
Description copied from interface:IDiffReturn a string that describes the difference represented by this node.- Specified by:
toDiffStringin interfaceIDiff- Overrides:
toDiffStringin classDiff- Returns:
- a string that describes the difference represented by this node
-
equals
-