|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Objectcom.microsoft.tfs.core.clients.versioncontrol.conflicts.resolutions.contributors.ExternalConflictResolutionContributor
public final class ExternalConflictResolutionContributor
Constructor Summary | |
---|---|
ExternalConflictResolutionContributor(ExternalToolset mergeToolset)
|
Method Summary | |
---|---|
java.util.Collection<ConflictResolution> |
getConflictResolutions(ConflictDescription conflictDescription,
ConflictResolutionOptions resolutionOptions)
Returns a list of contributed ConflictResolution s (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 |
---|
public ExternalConflictResolutionContributor(ExternalToolset mergeToolset)
Method Detail |
---|
public java.util.Collection<ConflictResolution> getConflictResolutions(ConflictDescription conflictDescription, ConflictResolutionOptions resolutionOptions)
ConflictResolutionContributor
ConflictResolution
s (eg, external
merge tools, internal merge tools, etc.) that are available to this
ConflictDescription
.
getConflictResolutions
in interface ConflictResolutionContributor
conflictDescription
- The ConflictDescription
being resolvedresolutionOptions
- The ConflictResolutionOptions
s for this resolution
null
)
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |