|
||||||||||
PREV NEXT | FRAMES NO FRAMES |
Packages that use ConflictResolutionStatus | |
---|---|
com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions |
Uses of ConflictResolutionStatus in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions |
---|
Fields in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions declared as ConflictResolutionStatus | |
---|---|
static ConflictResolutionStatus |
ConflictResolutionStatus.CANCELLED
|
static ConflictResolutionStatus |
ConflictResolutionStatus.FAILED
|
static ConflictResolutionStatus |
ConflictResolutionStatus.NOT_STARTED
|
static ConflictResolutionStatus |
ConflictResolutionStatus.RUNNING
|
static ConflictResolutionStatus |
ConflictResolutionStatus.SUCCEEDED_WITH_CONFLICTS
|
static ConflictResolutionStatus |
ConflictResolutionStatus.SUCCESS
|
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions that return ConflictResolutionStatus | |
---|---|
ConflictResolutionStatus |
ConflictResolution.getStatus()
Gets the current resolution status |
ConflictResolutionStatus |
ConflictResolution.resolveConflict()
Resolve the conflict. |
ConflictResolutionStatus |
KeepLocalWritableConflictResolution.work()
|
ConflictResolutionStatus |
ExternalConflictResolution.work()
|
ConflictResolutionStatus |
CoreConflictResolution.work()
|
protected abstract ConflictResolutionStatus |
ConflictResolution.work()
|
protected ConflictResolutionStatus |
AutomergeWritableConflictResolution.work()
|
Methods in com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions with parameters of type ConflictResolutionStatus | |
---|---|
protected void |
ConflictResolution.setStatus(ConflictResolutionStatus status)
Subclasses may set the status of the resolution. |
void |
ConflictResolutionStatusListener.statusChanged(ConflictResolution conflictResolution,
ConflictResolutionStatus newStatus)
Callback for ConflictResolution to update the progress of resolution. |
|
||||||||||
PREV NEXT | FRAMES NO FRAMES |