|
||||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | |||||||||
java.lang.Objectcom.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription
com.microsoft.tfs.core.clients.versioncontrol.conflicts.VersionConflictDescription
com.microsoft.tfs.core.clients.versioncontrol.conflicts.DeletedConflictDescription
com.microsoft.tfs.core.clients.versioncontrol.conflicts.MergeSourceDeletedConflictDescription
public class MergeSourceDeletedConflictDescription
| Constructor Summary | |
|---|---|
protected |
MergeSourceDeletedConflictDescription(Workspace workspace,
Conflict conflict,
ItemSpec[] conflictItemSpecs)
|
| Method Summary | |
|---|---|
ConflictCategory |
getConflictCategory()
Gets the category of this conflict |
java.lang.String |
getDescription()
A long description of this conflict, suitable for display to the user. eg ("You have a conflicting pending change.") |
java.lang.String |
getLocalFileDescription()
The local file in a merge conflict is called the "source". |
java.lang.String |
getName()
A short description of the conflict, eg "Version Conflict" |
java.lang.String |
getRemoteFileDescription()
The server file in a merge conflict is called the "target". |
ConflictResolution[] |
getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. If the toolset is not null and
contains a matching tool, external resolution options may be available. |
| Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.DeletedConflictDescription |
|---|
analyzeConflict, getChangeDescription, isResolutionEnabled, showChangeDescription |
| Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.VersionConflictDescription |
|---|
clearAnalysis, filesRenamed, filesRenamedOnly, hasAnalyzed, isEncodingChange, targetRenamed |
| Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription |
|---|
getConflict, getConflictItemSpecs, getLocalPath, getLocalPath, getServerPath, getWorkspace, isBaseless, loadContributedResolutions |
| Methods inherited from class java.lang.Object |
|---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
| Constructor Detail |
|---|
protected MergeSourceDeletedConflictDescription(Workspace workspace,
Conflict conflict,
ItemSpec[] conflictItemSpecs)
| Method Detail |
|---|
public ConflictCategory getConflictCategory()
getConflictCategory in class VersionConflictDescriptionpublic java.lang.String getName()
getName in class VersionConflictDescriptionpublic java.lang.String getDescription()
getDescription in class VersionConflictDescriptionpublic java.lang.String getLocalFileDescription()
getLocalFileDescription in class ConflictDescriptionpublic java.lang.String getRemoteFileDescription()
getRemoteFileDescription in class ConflictDescriptionpublic ConflictResolution[] getResolutions(ConflictResolutionContributor resolutionContributor)
null and
contains a matching tool, external resolution options may be available.
getResolutions in class VersionConflictDescriptionresolutionContributor - an object which contributes resolutions for conflicts. May be
null, but external resolution options won't be
available.
ConflictResolutions for this particular
conflict.
|
||||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | |||||||||