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

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
Direct Known Subclasses:
BothDeletedConflictDescription, LocallyDeletedConflictDescription, MergeBothDeletedConflictDescription, MergeSourceDeletedConflictDescription, MergeTargetDeletedConflictDescription, ServerDeletedConflictDescription

public abstract class DeletedConflictDescription
extends VersionConflictDescription

Since:
TEE-SDK-10.1

Constructor Summary
protected DeletedConflictDescription(Workspace workspace, Conflict conflict, ItemSpec[] conflictItemSpecs)
           
 
Method Summary
 boolean analyzeConflict()
          Deleted conflicts do not analyze (they're missing a file critical in analyzing the conflict.) Analyze the conflict for mergeability, etc.
 java.lang.String getChangeDescription()
          Deleted conflicts do not have change descriptions.
 boolean isResolutionEnabled(ConflictResolution resolution)
          Determines if a conflict resolution should be enabled (shown to the user.) We may know ahead of time that certain conflict resolutions (for example, AcceptMerge) are invalid (due to analyzing the conflict.)
 boolean showChangeDescription()
          For deleted conflicts, the change summary cannot be determined (since the target does not exist.) The UI should attempt to show a change description (number of local/server/conflicting changes.)
 
Methods inherited from class com.microsoft.tfs.core.clients.versioncontrol.conflicts.VersionConflictDescription
clearAnalysis, filesRenamed, filesRenamedOnly, getConflictCategory, getDescription, getName, getResolutions, 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

DeletedConflictDescription

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

showChangeDescription

public boolean showChangeDescription()
For deleted conflicts, the change summary cannot be determined (since the target does not exist.) The UI should attempt to show a change description (number of local/server/conflicting changes.)

Overrides:
showChangeDescription in class VersionConflictDescription
Returns:
true to show change description, false otherwise

getChangeDescription

public java.lang.String getChangeDescription()
Deleted conflicts do not have change descriptions. Since showChangeDescription() always returns false, this method should never be called. Gets the change description. Note that one should probably populate the conflict ContentMergeSummary before calling this for it to be useful. (See ConflictMergeSummaryCommand). Returns the "change description" - number of local/server/conflicting changes.

Overrides:
getChangeDescription in class VersionConflictDescription

analyzeConflict

public boolean analyzeConflict()
Deleted conflicts do not analyze (they're missing a file critical in analyzing the conflict.) Analyze the conflict for mergeability, etc. Running mergeEngine.countContentConflicts() will populate the conflict object's content conflict information. Analyze the conflict for mergeability, enablement, etc.

Overrides:
analyzeConflict in class VersionConflictDescription
Returns:
true if the conflict was analyzed, false if no changes were made

isResolutionEnabled

public boolean isResolutionEnabled(ConflictResolution resolution)
Determines if a conflict resolution should be enabled (shown to the user.) We may know ahead of time that certain conflict resolutions (for example, AcceptMerge) are invalid (due to analyzing the conflict.)

Overrides:
isResolutionEnabled in class VersionConflictDescription
Parameters:
resolution - The resolution to examine
Returns:
true if the resolution is enabled, false otherwise


© 2015 Microsoft. All rights reserved.