|
||||||||||
| 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.CompositeConflictResolutionContributor
public class CompositeConflictResolutionContributor
| Constructor Summary | |
|---|---|
CompositeConflictResolutionContributor()
|
|
CompositeConflictResolutionContributor(ConflictResolutionContributor[] subContributors)
|
|
| Method Summary | |
|---|---|
void |
addContributor(ConflictResolutionContributor subContributor)
|
void |
addContributors(ConflictResolutionContributor[] subContributors)
|
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 |
|---|
public CompositeConflictResolutionContributor()
public CompositeConflictResolutionContributor(ConflictResolutionContributor[] subContributors)
| Method Detail |
|---|
public void addContributor(ConflictResolutionContributor subContributor)
public void addContributors(ConflictResolutionContributor[] subContributors)
public java.util.Collection<ConflictResolution> getConflictResolutions(ConflictDescription conflictDescription,
ConflictResolutionOptions resolutionOptions)
ConflictResolutionContributorConflictResolutions (eg, external
merge tools, internal merge tools, etc.) that are available to this
ConflictDescription.
getConflictResolutions in interface ConflictResolutionContributorconflictDescription - The ConflictDescription being resolvedresolutionOptions - The ConflictResolutionOptionss for this resolution
null)
|
||||||||||
| PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
| SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD | |||||||||