Uses of Interface
com._1c.g5.v8.dt.compare.externaltool.IExternalMergeToolProvider

Packages that use IExternalMergeToolProvider

Package	Description
com._1c.g5.v8.dt.bsl.compare
com._1c.g5.v8.dt.compare.externaltool
com._1c.g5.v8.dt.compare.merge
com._1c.g5.v8.dt.compare.ui.editor
com._1c.g5.v8.dt.compare.ui.util
com._1c.g5.v8.dt.internal.bsl.compare.ui
com._1c.g5.v8.dt.internal.bsl.compare.ui.wizard
com._1c.g5.v8.dt.internal.compare.ui.externaltool

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

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

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 IExternalMergeToolProvider in com._1c.g5.v8.dt.compare.externaltool

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

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 IExternalMergeToolProvider in com._1c.g5.v8.dt.compare.merge

Methods in com._1c.g5.v8.dt.compare.merge with parameters of type IExternalMergeToolProvider

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 ExternalMergeToolResult	MergeUtils.getExternalMergeToolResult(ExternalPropertyComparisonNode node, IComparisonSession session, String symlinkPostfix, IExternalMergeToolProvider externalMergeToolProvider, ISymbolicLinkLocalizer symbolicLinkLocalizer, IQualifiedNameFilePathConverter filePathConverter)	Merges external property using external tool and return external merge tool result
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.

Uses of IExternalMergeToolProvider in com._1c.g5.v8.dt.compare.ui.editor

Methods in com._1c.g5.v8.dt.compare.ui.editor that return IExternalMergeToolProvider

Modifier and Type	Method	Description
IExternalMergeToolProvider	DtComparisonViewContext.getExternalMergeToolProvider()	Returns the external merge tool provider.

Constructors in com._1c.g5.v8.dt.compare.ui.editor with parameters of type IExternalMergeToolProvider

Modifier	Constructor	Description
	DtComparisonViewContext(IPartialModelNode rootNode, INamedViewerFilter[] filters, INamedViewerFilter initialFilter, boolean readOnly, boolean needMergeSettingsColumn, String mainComparisonSideName, String otherComparisonSideName, IDtComparisonViewDataProvider dataProvider, IDtComparisonViewListener listener, IPartialModelProvider partialModelProvider, PartialModelController partialModelController, org.eclipse.jface.resource.ResourceManager resourceManager, ISelectionProviderDelegate selectionProviderDelegate, IExternalMergeToolProvider externalMergeToolProvider)	Constructor.

Uses of IExternalMergeToolProvider in com._1c.g5.v8.dt.compare.ui.util

Methods in com._1c.g5.v8.dt.compare.ui.util with parameters of type IExternalMergeToolProvider

Modifier and Type	Method	Description
static void	MergeUiUtils.compareExternalPropertyUsingExternalTool(ExternalPropertyPartialModelNode node, String symlinkPostfix, org.eclipse.swt.widgets.Shell shell, String mainComparisonSideName, String otherComparisonSideName, IExternalMergeToolProvider externalMergeToolProvider, ISymbolicLinkLocalizer symbolicLinkLocalizer, IQualifiedNameFilePathConverter filePathConverter)	Compares the external property using external tool.
static ExternalMergeToolConfiguration	MergeUiUtils.getExternalMergeToolConfiguration(IPartialModelNode node, boolean readOnly, IExternalMergeToolProvider externalMergeToolProvider)	Gets external merge tool configuration to given node.
static void	MergeUiUtils.mergeExternalPropertyUsingExternalTool(ExternalPropertyPartialModelNode node, IPartialModel partialModel, PartialModelController partialModelController, String symlinkPostfix, org.eclipse.swt.widgets.Shell shell, String mainComparisonSideName, String otherComparisonSideName, IExternalMergeToolProvider externalMergeToolProvider, ISymbolicLinkLocalizer symbolicLinkLocalizer, IQualifiedNameFilePathConverter filePathConverter)	Merges the external property using external tool.
static void	MergeUiUtils.processExternalPropertyUsingExternalTool(ExternalPropertyPartialModelNode node, IPartialModel partialModel, PartialModelController partialModelController, org.eclipse.swt.widgets.Shell shell, boolean readOnly, String mainComparisonSideName, String otherComparisonSideName, IThreeSideTypedMergeCreator typedCreator, IExternalMergeToolProvider externalMergeToolProvider, ISymbolicLinkLocalizer symbolicLinkLocalizer, IQualifiedNameFilePathConverter filePathConverter)	Processes the external property using external tool.

Uses of IExternalMergeToolProvider in com._1c.g5.v8.dt.internal.bsl.compare.ui

Methods in com._1c.g5.v8.dt.internal.bsl.compare.ui with parameters of type IExternalMergeToolProvider

Modifier and Type	Method	Description
static void	BslCompareUiUtils.compareBslModuleSectionUsingExternalTool(BslModuleSectionPartialModelNode node, org.eclipse.swt.widgets.Shell shell, IExternalMergeToolProvider externalMergeToolProvider, IQualifiedNameFilePathConverter filePathConverter)	Compares the bsl module section using external tool.
static void	BslCompareUiUtils.mergeBslModuleSectionUsingExternalTool(BslModuleSectionPartialModelNode node, IPartialModel partialModel, PartialModelController partialModelController, org.eclipse.swt.widgets.Shell shell, IExternalMergeToolProvider externalMergeToolProvider, IQualifiedNameFilePathConverter filePathConverter)	Merges the bsl module section using external tool.
static void	BslCompareUiUtils.processBslModuleWithParsingModuleStructure(ExternalPropertyPartialModelNode node, IPartialModel partialModel, PartialModelController partialModelController, org.eclipse.swt.widgets.Shell shell, boolean readOnly, String mainComparisonSideName, String otherComparisonSideName, DtComparisonView parentComparisonView, ISelectionProviderDelegate selectionProviderDelegate, org.eclipse.jface.resource.ResourceManager resourceManager, IComparisonManager comparisonManager, IExternalMergeToolProvider externalMergeToolProvider, ISymbolicLinkLocalizer symbolicLinkLocalizer, IQualifiedNameFilePathConverter filePathConverter)	Processes bsl module with parsing module structure.

Uses of IExternalMergeToolProvider in com._1c.g5.v8.dt.internal.bsl.compare.ui.wizard

Constructors in com._1c.g5.v8.dt.internal.bsl.compare.ui.wizard with parameters of type IExternalMergeToolProvider

Modifier	Constructor	Description
protected	AbstractCompareBslModuleWithParsingModuleStructureDialog(org.eclipse.swt.widgets.Shell shell, ExternalPropertyPartialModelNode node, IPartialModel partialModel, IComparedObjects<org.eclipse.jface.text.IDocument> comparingDocuments, boolean readOnly, String mainComparisonSideName, String otherComparisonSideName, INamedViewerFilter initialNamedViewerFilter, PartialModelController partialModelController, IComparisonManager comparisonManager, IQualifiedNameFilePathConverter filePathConverter, org.eclipse.jface.resource.ResourceManager resourceManager, ISelectionProviderDelegate selectionProviderDelegate, ISymbolicLinkLocalizer symbolicLinkLocalizer, IExternalMergeToolProvider externalMergeToolProvider)	Creates a new instance.
	CompareBslModuleWithParsingModuleStructureDialog(org.eclipse.swt.widgets.Shell shell, ExternalPropertyPartialModelNode node, IPartialModel partialModel, IComparedObjects<org.eclipse.jface.text.IDocument> comparingDocuments, String mainComparisonSideName, String otherComparisonSideName, INamedViewerFilter initialNamedViewerFilter, PartialModelController partialModelController, IComparisonManager comparisonManager, IQualifiedNameFilePathConverter filePathConverter, org.eclipse.ui.services.IServiceLocator serviceLocator, org.eclipse.jface.resource.ResourceManager resourceManager, ISelectionProviderDelegate selectionProviderDelegate, ISymbolicLinkLocalizer symbolicLinkLocalizer, IExternalMergeToolProvider externalMergeToolProvider)	Creates a new instance.
	ReadOnlyCompareBslModuleWithParsingModuleStructureDialog(org.eclipse.swt.widgets.Shell shell, ExternalPropertyPartialModelNode node, IPartialModel partialModel, IComparedObjects<org.eclipse.jface.text.IDocument> comparingDocuments, String mainComparisonSideName, String otherComparisonSideName, INamedViewerFilter initialNamedViewerFilter, PartialModelController partialModelController, IComparisonManager comparisonManager, IQualifiedNameFilePathConverter filePathConverter, org.eclipse.jface.resource.ResourceManager resourceManager, ISelectionProviderDelegate selectionProviderDelegate, ISymbolicLinkLocalizer symbolicLinkLocalizer, IExternalMergeToolProvider externalMergeToolProvider)	Creates a new instance.

Uses of IExternalMergeToolProvider in com._1c.g5.v8.dt.internal.compare.ui.externaltool

Classes in com._1c.g5.v8.dt.internal.compare.ui.externaltool that implement IExternalMergeToolProvider

Modifier and Type	Class	Description
class	ExternalMergeToolManager	The default IExternalMergeToolProvider implementation.