|
Eclipse Platform Release 3.2 |
|||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
public interface IThreeWayDiff
A three-way delta that describe the synchronization state between two contributors and an ancestor. For simplicity, we refer to one of the contributors as the local and the other as the remote. A three-way delta is represented as a combination of two two-way deltas, one between the ancestor and local and the other between the ancestor and remote. For a three-way delta, clients can assume that the before state of both the local and remote changes are the same.
This interface is not intended to be implemented by clients.
Clients that need to create deltas should instead use
ThreeWayDiff
.
Field Summary | |
---|---|
static int |
CONFLICTING
Constant (bit mask) indicating that there is both a local change and a remote change. |
static int |
DIRECTION_MASK
Bit mask for extracting the synchronization direction. |
static int |
INCOMING
Constant (bit mask) indicating that there is a local change. |
static int |
OUTGOING
Constant (bit mask) indicating that there is a local change. |
Fields inherited from interface org.eclipse.team.core.diff.IDiff |
---|
ADD, CHANGE, NO_CHANGE, REMOVE |
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. |
Methods inherited from interface org.eclipse.team.core.diff.IDiff |
---|
getKind, getPath, toDiffString |
Field Detail |
---|
static final int OUTGOING
getDirection()
,
Constant Field Valuesstatic final int INCOMING
getDirection()
,
Constant Field Valuesstatic final int CONFLICTING
OUTGOING | INCOMING
.
getDirection()
,
Constant Field Valuesstatic final int DIRECTION_MASK
Method Detail |
---|
ITwoWayDiff getLocalChange()
IDiff.NO_CHANGE
is returned or null
may be returned.
null
ITwoWayDiff getRemoteChange()
IDiff.NO_CHANGE
is returned or null
may be returned.
null
int getDirection()
INCOMING
,
OUTGOING
,
CONFLICTING
|
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.