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

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.ShelvesetConflictDescription

public class ShelvesetConflictDescription
extends VersionConflictDescription


Constructor Summary
protected ShelvesetConflictDescription(Workspace workspace, Conflict conflict, ItemSpec[] conflictItemSpecs)
           
 
Method Summary
 ConflictCategory getConflictCategory()
          Gets the category of this conflict
 java.lang.String getName()
          A short description of the conflict, eg "Version Conflict"
 java.lang.String getRemoteFileDescription()
          Gets the description of the server's file.
 
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.VersionConflictDescription
analyzeConflict, clearAnalysis, filesRenamed, filesRenamedOnly, getChangeDescription, getDescription, getResolutions, hasAnalyzed, isEncodingChange, isResolutionEnabled, showChangeDescription, targetRenamed
 
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.ConflictDescription
getConflict, getConflictItemSpecs, getLocalFileDescription, 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

ShelvesetConflictDescription

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

getConflictCategory

public ConflictCategory getConflictCategory()
Description copied from class: VersionConflictDescription
Gets the category of this conflict

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

getName

public java.lang.String getName()
A short description of the conflict, eg "Version Conflict"

Overrides:
getName in class VersionConflictDescription
Returns:
A String representing the short description of the conflict

getRemoteFileDescription

public java.lang.String getRemoteFileDescription()
Description copied from class: ConflictDescription
Gets the description of the server's file. For most conflicts, this is generally called the "server" file.

Overrides:
getRemoteFileDescription in class ConflictDescription
Returns:
A String representing the name of the server file


© 2015 Microsoft. All rights reserved.