com.microsoft.tfs.core.clients.versioncontrol.conflicts
Class ServerDeletedConflictDescription

java.lang.Object
  extended by com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription
      extended by com.microsoft.tfs.core.clients.versioncontrol.conflicts.VersionConflictDescription
          extended by com.microsoft.tfs.core.clients.versioncontrol.conflicts.DeletedConflictDescription
              extended by com.microsoft.tfs.core.clients.versioncontrol.conflicts.ServerDeletedConflictDescription

public class ServerDeletedConflictDescription
extends DeletedConflictDescription

This is a deleted conflict, occurring when you attempt to edit a file such that the remote file has been deleted.

Since:
TEE-SDK-10.1

Constructor Summary
protected ServerDeletedConflictDescription(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.
 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.DeletedConflictDescription
analyzeConflict, getChangeDescription, isResolutionEnabled, showChangeDescription
 
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.VersionConflictDescription
clearAnalysis, filesRenamed, filesRenamedOnly, getName, hasAnalyzed, isEncodingChange, targetRenamed
 
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription
getConflict, getConflictItemSpecs, getLocalFileDescription, getLocalPath, getLocalPath, getRemoteFileDescription, getServerPath, getWorkspace, isBaseless, loadContributedResolutions
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 

Constructor Detail

ServerDeletedConflictDescription

protected ServerDeletedConflictDescription(Workspace workspace,
                                           Conflict conflict,
                                           ItemSpec[] conflictItemSpecs)
Method Detail

getConflictCategory

public ConflictCategory getConflictCategory()
Gets the category of this conflict

Overrides:
getConflictCategory in class VersionConflictDescription
Returns:
A ConflictCategory for this conflict

getDescription

public java.lang.String getDescription()
A long description of this conflict, suitable for display to the user. eg ("You have a conflicting pending change.")

Overrides:
getDescription in class VersionConflictDescription
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.

Overrides:
getResolutions in class VersionConflictDescription
Parameters:
resolutionContributor - an object which contributes resolutions for conflicts. May be null, but external resolution options won't be available.
Returns:
An array of ConflictResolutions for this particular conflict.


© 2015 Microsoft. All rights reserved.