Uses of Class
com._1c.g5.v8.dt.compare.externaltool.ExternalMergeToolConfiguration

Packages that use ExternalMergeToolConfiguration

Package	Description
com._1c.g5.v8.dt.bsl.compare
com._1c.g5.v8.dt.compare.externaltool

Uses of ExternalMergeToolConfiguration in com._1c.g5.v8.dt.bsl.compare

Methods in com._1c.g5.v8.dt.bsl.compare with parameters of type ExternalMergeToolConfiguration

Modifier and Type	Method	Description
static ExternalMergeToolExecutionStatus	BslCompareUtils.mergeModuleUsingExternalTool(BslModuleComparisonNode node, IComparisonSession session, ExternalMergeToolConfiguration externalMergeToolConfiguration, int timeout, boolean runAutoMergeByDefault, String mainComparisonSideName, String otherComparisonSideName, File mergeResultFile, IQualifiedNameFilePathConverter filePathConverter, ISymbolicLinkLocalizer symbolicLinkLocalizer)	Merges the Bsl module using an external tool for the specified node.

Uses of ExternalMergeToolConfiguration in com._1c.g5.v8.dt.compare.externaltool

Methods in com._1c.g5.v8.dt.compare.externaltool that return ExternalMergeToolConfiguration

Modifier and Type	Method	Description
ExternalMergeToolConfiguration	ExternalMergeToolConfiguration.ExternalMergeToolConfigurationBuilder.build()	Builds a new external merge tool configuration instantiated according to values set here.
ExternalMergeToolConfiguration	IExternalMergeToolProvider.getThreeWayComparisonExternalTool()	Returns the three-way comparison external tool.
ExternalMergeToolConfiguration	IExternalMergeToolProvider.getThreeWayMergeExternalTool()	Returns the three-way merge external tool.
ExternalMergeToolConfiguration	IExternalMergeToolProvider.getTwoWayComparisonExternalTool()	Returns the two-way comparison external tool.
ExternalMergeToolConfiguration	IExternalMergeToolProvider.getTwoWayMergeExternalTool()	Returns the two-way merge external tool.

Methods in com._1c.g5.v8.dt.compare.externaltool that return types with arguments of type ExternalMergeToolConfiguration

Modifier and Type	Method	Description
Optional<ExternalMergeToolConfiguration>	IExternalMergeToolProvider.getExternalMergeToolByName(String toolName)	Returns the external merge tool by name.
List<ExternalMergeToolConfiguration>	IExternalMergeToolProvider.getExternalMergeTools()	Returns all external merge tools.

Methods in com._1c.g5.v8.dt.compare.externaltool with parameters of type ExternalMergeToolConfiguration

Modifier and Type	Method	Description
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runAutoThreeWayMerge(ExternalMergeToolConfiguration externalMergeToolConfiguration, int timeout, File mainFile, File otherFile, File ancestorFile, File mergeResultFile, String mainTitle, String otherTitle, String ancestorTitle)	Runs the automatic three-way merge using the specified external merge tool.
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runAutoThreeWayMerge(ExternalMergeToolConfiguration externalMergeToolConfiguration, int timeout, InputStream mainStream, InputStream otherStream, InputStream ancestorStream, File mergeResultFile, String mainTitle, String otherTitle, String ancestorTitle)	Runs the automatic three-way merge using the specified external merge tool.
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runThreeWayComparison(ExternalMergeToolConfiguration externalMergeToolConfiguration, int timeout, File mainFile, File otherFile, File ancestorFile, String mainTitle, String otherTitle, String ancestorTitle)	Runs the three-way comparison using the specified external merge tool.
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runThreeWayComparison(ExternalMergeToolConfiguration externalMergeToolConfiguration, int timeout, InputStream mainStream, InputStream otherStream, InputStream ancestorStream, String mainTitle, String otherTitle, String ancestorTitle)	Runs the three-way comparison using the specified external merge tool.
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runThreeWayMerge(ExternalMergeToolConfiguration externalMergeToolConfiguration, int timeout, File mainFile, File otherFile, File ancestorFile, File mergeResultFile, String mainTitle, String otherTitle, String ancestorTitle)	Runs the three-way merge using the specified external merge tool.
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runThreeWayMerge(ExternalMergeToolConfiguration externalMergeToolConfiguration, int timeout, InputStream mainStream, InputStream otherStream, InputStream ancestorStream, File mergeResultFile, String mainTitle, String otherTitle, String ancestorTitle)	Runs the three-way merge using the specified external merge tool.
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runTwoWayComparison(ExternalMergeToolConfiguration externalMergeToolConfiguration, int timeout, File mainFile, File otherFile, String mainTitle, String otherTitle)	Runs the two-way comparison using the specified external merge tool.
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runTwoWayComparison(ExternalMergeToolConfiguration externalMergeToolConfiguration, int timeout, InputStream mainStream, InputStream otherStream, String mainTitle, String otherTitle)	Runs the two-way comparison using the specified external merge tool.
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runTwoWayMerge(ExternalMergeToolConfiguration externalMergeToolConfiguration, int timeout, File mainFile, File otherFile, File mergeResultFile, String mainTitle, String otherTitle)	Runs the two-way merge using the specified external merge tool.
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runTwoWayMerge(ExternalMergeToolConfiguration externalMergeToolConfiguration, int timeout, InputStream mainStream, InputStream otherStream, File mergeResultFile, String mainTitle, String otherTitle)	Runs the two-way merge using the specified external merge tool.