|
||||||||||
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.FilenameConflictDescription
public final class FilenameConflictDescription
This is a filename conflict, occurring when a get request would produce a local file with the same name as an already existing file.
Constructor Summary | |
---|---|
protected |
FilenameConflictDescription(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. |
java.lang.String |
getName()
A short description of the conflict, eg "Version Conflict" |
ConflictResolution[] |
getResolutions(ConflictResolutionContributor resolutionContributor)
Gets the resolution options for this particular conflict with the available merge toolset. |
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription |
---|
analyzeConflict, clearAnalysis, getChangeDescription, getConflict, getConflictItemSpecs, getLocalFileDescription, getLocalPath, getLocalPath, getRemoteFileDescription, getServerPath, getWorkspace, hasAnalyzed, isBaseless, isResolutionEnabled, loadContributedResolutions, showChangeDescription |
Methods inherited from class java.lang.Object |
---|
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
Constructor Detail |
---|
protected FilenameConflictDescription(Workspace workspace, Conflict conflict, ItemSpec[] conflictItemSpecs)
Method Detail |
---|
public ConflictCategory getConflictCategory()
getConflictCategory
in class ConflictDescription
public java.lang.String getName()
getName
in class ConflictDescription
public java.lang.String getDescription()
getDescription
in class ConflictDescription
public ConflictResolution[] getResolutions(ConflictResolutionContributor resolutionContributor)
null
and
contains a matching tool, external resolution options may be available.
getResolutions
in class ConflictDescription
resolutionContributor
- an object which contributes resolutions for conflicts. May be
null
, but external resolution options won't be
available.
ConflictResolution
s for this particular
conflict.
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |