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

Packages that use ExternalMergeToolExecutionStatus

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

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

Methods in com._1c.g5.v8.dt.bsl.compare that return ExternalMergeToolExecutionStatus

Modifier and Type	Method	Description
static ExternalMergeToolExecutionStatus	BslCompareUtils.executeExternalMergeToolForBslModuleSection(BslModuleSectionComparisonNode node, IComparisonSession session, IComparedObjects<org.eclipse.jface.text.IDocument> comparingDocuments, boolean isMerge, File mergeResultFile, IExternalMergeToolProvider externalMergeToolProvider)	Executes external merge tool for bsl module section.

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

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

Modifier and Type	Method	Description
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runAutoThreeWayMerge(IExternalMergeToolProvider externalMergeToolProvider, 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(IExternalMergeToolProvider externalMergeToolProvider, 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(IExternalMergeToolProvider externalMergeToolProvider, 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(IExternalMergeToolProvider externalMergeToolProvider, 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(IExternalMergeToolProvider externalMergeToolProvider, 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(IExternalMergeToolProvider externalMergeToolProvider, 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(IExternalMergeToolProvider externalMergeToolProvider, File mainFile, File otherFile, String mainTitle, String otherTitle)	Runs the two-way comparison using the specified external merge tool.
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runTwoWayComparison(IExternalMergeToolProvider externalMergeToolProvider, InputStream mainStream, InputStream otherStream, String mainTitle, String otherTitle)	Runs the two-way comparison using the specified external merge tool.
static ExternalMergeToolExecutionStatus	ExternalMergeToolUtils.runTwoWayMerge(IExternalMergeToolProvider externalMergeToolProvider, 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(IExternalMergeToolProvider externalMergeToolProvider, InputStream mainStream, InputStream otherStream, File mergeResultFile, String mainTitle, String otherTitle)	Runs the two-way merge using the specified external merge tool.

Uses of ExternalMergeToolExecutionStatus in com._1c.g5.v8.dt.compare.merge

Methods in com._1c.g5.v8.dt.compare.merge that return ExternalMergeToolExecutionStatus

Modifier and Type	Method	Description
static ExternalMergeToolExecutionStatus	ExternalPropertyUtils.executeExternalMergeTool(ExternalPropertyComparisonNode node, IComparisonSession session, String symlinkPostfix, boolean isMerge, boolean runAutoMerge, File mergeResultFile, String mainComparisonSideName, String otherComparisonSideName, IExternalMergeToolProvider externalMergeToolProvider, ISymbolicLinkLocalizer symbolicLinkLocalizer, IQualifiedNameFilePathConverter filePathConverter)	Executes external merge tool for external property.
static ExternalMergeToolExecutionStatus	ExternalPropertyUtils.runExternalMergeTool(IExternalMergeToolProvider externalMergeToolProvider, InputStream mainStream, InputStream otherStream, InputStream ancestorStream, File mergeResultFile, String mainTitle, String otherTitle, String ancestorTitle, boolean isMerge, boolean runAutoMerge, boolean isThreeWay)	Runs external merge tool for external property.