|
Eclipse Platform Release 3.2 |
|||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Objectorg.eclipse.team.core.diff.provider.Diff
org.eclipse.team.core.diff.provider.ThreeWayDiff
Implementation of IThreeWayDiff
.
This class is not intended to be subclasses by clients.
Field Summary |
---|
Fields inherited from class org.eclipse.team.core.diff.provider.Diff |
---|
KIND_MASK |
Fields inherited from interface org.eclipse.team.core.diff.IThreeWayDiff |
---|
CONFLICTING, DIRECTION_MASK, INCOMING, OUTGOING |
Fields inherited from interface org.eclipse.team.core.diff.IDiff |
---|
ADD, CHANGE, NO_CHANGE, REMOVE |
Constructor Summary | |
---|---|
ThreeWayDiff(ITwoWayDiff localChange,
ITwoWayDiff remoteChange)
Create a three-way delta from the two changes. |
Method Summary | |
---|---|
int |
getDirection()
Return the direction of this three-way delta. |
ITwoWayDiff |
getLocalChange()
Return the local change associated with this delta. |
ITwoWayDiff |
getRemoteChange()
Return the remote change associated with this delta. |
String |
toDiffString()
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 |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Methods inherited from interface org.eclipse.team.core.diff.IDiff |
---|
getKind, getPath |
Constructor Detail |
public ThreeWayDiff(ITwoWayDiff localChange, ITwoWayDiff remoteChange)
null
but at least one must be non-null
).
localChange
- the local change in the model object or null
if there is no local changeremoteChange
- the remote change in the model object or null
if there is no local changeMethod Detail |
public ITwoWayDiff getLocalChange()
IThreeWayDiff
IDiff.NO_CHANGE
is returned or null
may be returned.
getLocalChange
in interface IThreeWayDiff
null
public ITwoWayDiff getRemoteChange()
IThreeWayDiff
IDiff.NO_CHANGE
is returned or null
may be returned.
getRemoteChange
in interface IThreeWayDiff
null
public int getDirection()
IThreeWayDiff
getDirection
in interface IThreeWayDiff
IThreeWayDiff.INCOMING
,
IThreeWayDiff.OUTGOING
,
IThreeWayDiff.CONFLICTING
public String toDiffString()
IDiff
toDiffString
in interface IDiff
toDiffString
in class Diff
|
Eclipse Platform Release 3.2 |
|||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
Guidelines for using Eclipse APIs.
Copyright (c) IBM Corp. and others 2000, 2006. All rights reserved.