com.microsoft.tfs.core.clients.versioncontrol.conflicts
Class UnknownConflictDescription
java.lang.Object
com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription
com.microsoft.tfs.core.clients.versioncontrol.conflicts.UnknownConflictDescription
public class UnknownConflictDescription
- extends ConflictDescription
- Since:
- TEE-SDK-10.1
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 |
UnknownConflictDescription
protected UnknownConflictDescription(Workspace workspace,
Conflict conflict,
ItemSpec[] conflictItemSpecs)
getConflictCategory
public ConflictCategory getConflictCategory()
- Description copied from class:
ConflictDescription
- Gets the category of this conflict
- Specified by:
getConflictCategory
in class ConflictDescription
- Returns:
- A ConflictCategory for this conflict
getName
public java.lang.String getName()
- Description copied from class:
ConflictDescription
- A short description of the conflict, eg "Version Conflict"
- Specified by:
getName
in class ConflictDescription
- Returns:
- A String representing the short description of the conflict
getDescription
public java.lang.String getDescription()
- Description copied from class:
ConflictDescription
- A long description of this conflict, suitable for display to the user. eg
("You have a conflicting pending change.")
- Specified by:
getDescription
in class ConflictDescription
- Returns:
- A string representing the description of the conflict
getResolutions
public 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.
- Specified by:
getResolutions
in class ConflictDescription
- Parameters:
resolutionContributor
- an object which contributes resolutions for conflicts. May be
null
, but external resolution options won't be
available.
- Returns:
- An array of
ConflictResolution
s for this particular
conflict.
© 2015 Microsoft. All rights reserved.