com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors
Class ExternalConflictResolutionContributor

java.lang.Object
  extended by com.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors.ExternalConflictResolutionContributor
All Implemented Interfaces:
ConflictResolutionContributor

public final class ExternalConflictResolutionContributor
extends java.lang.Object
implements ConflictResolutionContributor

Since:
TEE-SDK-10.1

Constructor Summary
ExternalConflictResolutionContributor(ExternalToolset mergeToolset)
           
 
Method Summary
 java.util.Collection<ConflictResolution> getConflictResolutions(ConflictDescription conflictDescription, ConflictResolutionOptions resolutionOptions)
          Returns a list of contributed ConflictResolutions (eg, external merge tools, internal merge tools, etc.) that are available to this ConflictDescription.
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 

Constructor Detail

ExternalConflictResolutionContributor

public ExternalConflictResolutionContributor(ExternalToolset mergeToolset)
Method Detail

getConflictResolutions

public java.util.Collection<ConflictResolution> getConflictResolutions(ConflictDescription conflictDescription,
                                                                       ConflictResolutionOptions resolutionOptions)
Description copied from interface: ConflictResolutionContributor
Returns a list of contributed ConflictResolutions (eg, external merge tools, internal merge tools, etc.) that are available to this ConflictDescription.

Specified by:
getConflictResolutions in interface ConflictResolutionContributor
Parameters:
conflictDescription - The ConflictDescription being resolved
resolutionOptions - The ConflictResolutionOptionss for this resolution
Returns:
A collection of conflict resolutions (never null)


© 2015 Microsoft. All rights reserved.