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

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

public final class MergeTargetDeletedConflictDescription
extends DeletedConflictDescription

This is a merge deleted conflict, occurring when you attempt to merge such that a file in the source branch has been modified and the file in the target branch has been deleted. It is a special case of DeletedConflictDescription.

Since:
TEE-SDK-10.1

Constructor Summary
protected MergeTargetDeletedConflictDescription(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 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.
 
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

MergeTargetDeletedConflictDescription

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

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

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

getLocalFileDescription

public java.lang.String getLocalFileDescription()
The local file in a merge conflict is called the "source". Gets the description of the local file. For most conflicts, this is generally called the "local" file.

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

getRemoteFileDescription

public java.lang.String getRemoteFileDescription()
The server file in a merge conflict is called the "target". 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

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.