Package com._1c.g5.v8.dt.compare.merge

Class MergeUtils

java.lang.Object

com._1c.g5.v8.dt.compare.merge.MergeUtils

public class MergeUtils
extends Object

Utility methods of Merge.

Field Summary

Fields

Modifier and Type	Field	Description
static final String	EXTERNAL_MERGE_TOOL_RESULT_PREFIX	Prefix for external merge tool result file.

Method Summary

Modifier and Type	Method	Description
static void	addPostponedMergeOperation(MergeContext context, ExternalPropertyComparisonNode node, String qualifyingType, IPostponedFileOperation.IContentStreamProviderCreator postponedMergeCreator, IQualifiedNameFilePathConverter filePathConverter)	Adds postponed merge operation of external property node to merge context.
static ExternalMergeToolResult	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 void	restoreCustomSettings(ComparisonNode node, SerializableMergeSettings container, String customMergeSettingsLiteral)	Restores custom settings for the specified node from the given merge settings container.
static void	saveCustomSettings(ComparisonNode node, SerializableMergeSettings container, String customMergeSettingsLiteral)	Saves custom settings for the specified node into the given merge settings container.

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Details

EXTERNAL_MERGE_TOOL_RESULT_PREFIX

public static final String EXTERNAL_MERGE_TOOL_RESULT_PREFIX

Prefix for external merge tool result file.

See Also:

• Constant Field Values

Method Details

getExternalMergeToolResult

public static ExternalMergeToolResult 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

Parameters:

node - the external property node, should not be one side, cannot be null

session - the comparison session, cannot be null

symlinkPostfix - the symlink postfix, cannot be null

externalMergeToolProvider - the external merge tool provider, cannot be null

symbolicLinkLocalizer - the symbolic link localizer, cannot be null

filePathConverter - the file path converter, cannot be null

Returns:

the external merge tool result, never null

addPostponedMergeOperation

public static void addPostponedMergeOperation(MergeContext context,
 ExternalPropertyComparisonNode node,
 String qualifyingType,
 IPostponedFileOperation.IContentStreamProviderCreator postponedMergeCreator,
 IQualifiedNameFilePathConverter filePathConverter)

Adds postponed merge operation of external property node to merge context.

Parameters:

context - the merge context, cannot be null

node - the external property comparison node, cannot be null

qualifyingType - the qualifying type of comparison node, can be null

postponedMergeCreator - creator of postponed merge content stream provider, cannot be null

filePathConverter - the qualified name file path converter, cannot be null

saveCustomSettings

public static void saveCustomSettings(ComparisonNode node,
 SerializableMergeSettings container,
 String customMergeSettingsLiteral)

Saves custom settings for the specified node into the given merge settings container. Does nothing if the node doesn't have any custom settings.

Parameters:

node - the comparison node to save custom settings for, cannot be null

container - the container of serializable settings, cannot be null

customMergeSettingsLiteral - the custom merge settings literal to separate settings of one node type from another, cannot be null

restoreCustomSettings

public static void restoreCustomSettings(ComparisonNode node,
 SerializableMergeSettings container,
 String customMergeSettingsLiteral)

Restores custom settings for the specified node from the given merge settings container.

Parameters:

node - the comparison node to restore custom settings for, cannot be null

container - the container of serializable settings, cannot be null

customMergeSettingsLiteral - the custom merge settings literal to separate settings of one node type from another, cannot be null