Package com._1c.g5.v8.dt.compare.ui.util
Class MergeUiUtils
java.lang.Object
com._1c.g5.v8.dt.compare.ui.util.MergeUiUtils
Utility methods of UI Comparison and Merge.
-
Field Summary
FieldsModifier and TypeFieldDescriptionstatic final ITypedElementCreatorTemplate typed element creator.static final IThreeSideTypedMergeCreatorText document template three side typed merge creator. -
Method Summary
Modifier and TypeMethodDescriptionstatic voidcompareExternalPropertyUsingExternalTool(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 DtCompareEditorInputcreateCompareEditorInput(ExternalPropertyPartialModelNode node, String mainComparisonSideName, String otherComparisonSideName, ITypedElementCreator typedCreator, ISymbolicLinkLocalizer symbolicLinkLocalizer, IQualifiedNameFilePathConverter filePathConverter) Creates compare editor input.createMergeEditorInput(ExternalPropertyPartialModelNode node, String mainComparisonSideName, String otherComparisonSideName, IThreeSideTypedMergeCreator typedCreator, ISymbolicLinkLocalizer symbolicLinkLocalizer, IQualifiedNameFilePathConverter filePathConverter) Creates a text file three side merge editor input for the specified typed elements.static IThreeSideTextMergeInputcreateTextMergeInput(ComparisonNode node, boolean isThreeWay, org.eclipse.compare.ITypedElement mainElement, org.eclipse.compare.ITypedElement otherElement, org.eclipse.compare.ITypedElement ancestorElement, IThreeSideTypedMergeCreator typedCreator) Creates a three side text merge input for the specified typed elements.getExternalMergeToolConfiguration(IPartialModelNode node, boolean readOnly, IExternalMergeToolProvider externalMergeToolProvider) Gets external merge tool configuration to given node.static org.eclipse.compare.ITypedElementgetTypedElement(ExternalPropertyComparisonNode node, IComparisonSession session, ComparisonSide side, String comparisonSideName, org.eclipse.compare.CompareConfiguration compareConfiguration, ITypedElementCreator typedCreator, ISymbolicLinkLocalizer symbolicLinkLocalizer, IQualifiedNameFilePathConverter filePathConverter) Returns the external property node typed element.static voidmergeExternalPropertyUsingExternalTool(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 voidprocessExternalPropertyUsingExternalTool(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.static voidsaveMergeSettings(IMergeRulePartialModelNode node, IThreeSideTextMergeInput input, MergeRule newRule, IPartialModel partialModel, PartialModelController partialModelController) Saves the merge settings for the specified node.static voidsaveMergeSettings(IMergeRulePartialModelNode node, IPartialModel partialModel, PartialModelController partialModelController, File mergeResultFile) Saves the merge settings for the specified node.
-
Field Details
-
TEMPLATE_TYPED_CREATOR
Template typed element creator. -
TEXT_DOCUMENT_TYPED_CREATOR
Text document template three side typed merge creator.
-
-
Method Details
-
processExternalPropertyUsingExternalTool
public static void 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. Compares or merges an external property, depends on merge rules.- Parameters:
node- the external property partial model node, cannot benullpartialModel- the partial model, cannot benullpartialModelController- the partial model controller, cannot benullshell- the shell, cannot benullreadOnly-trueif the external property is read-only, andfalseotherwisemainComparisonSideName- the main comparison side name, cannot benullotherComparisonSideName- the other comparison side name, cannot benulltypedCreator- the three side typed merge creator, cannot benullexternalMergeToolProvider- the external merge tool provider, cannot benullsymbolicLinkLocalizer- the symbolic link localizer, cannot benullfilePathConverter- the file path converter, cannot benull
-
mergeExternalPropertyUsingExternalTool
public static void 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.- Parameters:
node- the external property partial model node, cannot benullpartialModel- the partial model, cannot benullpartialModelController- the partial model controller, cannot benullshell- the shell, cannot benullsymlinkPostfix- the symlink postfix, cannot benullmainComparisonSideName- the main comparison side name, cannot benullotherComparisonSideName- the other comparison side name, cannot benullexternalMergeToolProvider- the external merge tool provider, cannot benullsymbolicLinkLocalizer- the symbolic link localizer, cannot benullfilePathConverter- the file path converter, cannot benull
-
compareExternalPropertyUsingExternalTool
public static void 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.- Parameters:
node- the external property partial model node, cannot benullsymlinkPostfix- the symlink postfix, cannot benullshell- the shell, cannot benullmainComparisonSideName- the main comparison side name, cannot benullotherComparisonSideName- the other comparison side name, cannot benullexternalMergeToolProvider- the external merge tool provider, cannot benullsymbolicLinkLocalizer- the symbolic link localizer, cannot benullfilePathConverter- the file path converter, cannot benull
-
getExternalMergeToolConfiguration
public static ExternalMergeToolConfiguration getExternalMergeToolConfiguration(IPartialModelNode node, boolean readOnly, IExternalMergeToolProvider externalMergeToolProvider) Gets external merge tool configuration to given node.- Parameters:
node- the partial model node, cannot benullreadOnly-trueif the external property is read-only, andfalseotherwiseexternalMergeToolProvider- the external merge tool provider, cannot benull- Returns:
- the external merge tool configuration, may be
null
-
createMergeEditorInput
public static TextFileThreeSideMergeEditorInput createMergeEditorInput(ExternalPropertyPartialModelNode node, String mainComparisonSideName, String otherComparisonSideName, IThreeSideTypedMergeCreator typedCreator, ISymbolicLinkLocalizer symbolicLinkLocalizer, IQualifiedNameFilePathConverter filePathConverter) Creates a text file three side merge editor input for the specified typed elements.- Parameters:
node- the external property partial model node, cannot benullmainComparisonSideName- the main comparison side name, cannot benullotherComparisonSideName- the other comparison side name, cannot benulltypedCreator- the three side typed merge creator, cannot benullsymbolicLinkLocalizer- the symbolic link localizer, cannot benullfilePathConverter- the file path converter, cannot benull- Returns:
- the text file three side merge editor input, never
null
-
createCompareEditorInput
public static DtCompareEditorInput createCompareEditorInput(ExternalPropertyPartialModelNode node, String mainComparisonSideName, String otherComparisonSideName, ITypedElementCreator typedCreator, ISymbolicLinkLocalizer symbolicLinkLocalizer, IQualifiedNameFilePathConverter filePathConverter) Creates compare editor input.- Parameters:
node- the external property partial model node, cannot benullmainComparisonSideName- the main comparison side name, cannot benullotherComparisonSideName- the other comparison side name, cannot benulltypedCreator- the typed element creator, cannot benullsymbolicLinkLocalizer- the symbolic link localizer, cannot benullfilePathConverter- the file path converter, cannot benull- Returns:
- dt compare editor input, never
null
-
createTextMergeInput
public static IThreeSideTextMergeInput createTextMergeInput(ComparisonNode node, boolean isThreeWay, org.eclipse.compare.ITypedElement mainElement, org.eclipse.compare.ITypedElement otherElement, org.eclipse.compare.ITypedElement ancestorElement, IThreeSideTypedMergeCreator typedCreator) Creates a three side text merge input for the specified typed elements.- Parameters:
node- the comparison node to create merge input for, now should be instance ofSolidResourceComparisonNode,BslModuleComparisonNodeorBslModuleSectionComparisonNode, cannot benullisThreeWay-trueif the comparison session is three-way, andfalseif it is two-waymainTypedElement- the main typed element, cannot benullotherTypedElement- the other typed element, cannot benullancestorTypedElement- the ancestor typed element, may benulltypedCreator- the three side typed merge creator, cannot benull- Returns:
- the three side text merge input, never
null
-
getTypedElement
public static org.eclipse.compare.ITypedElement getTypedElement(ExternalPropertyComparisonNode node, IComparisonSession session, ComparisonSide side, String comparisonSideName, org.eclipse.compare.CompareConfiguration compareConfiguration, ITypedElementCreator typedCreator, ISymbolicLinkLocalizer symbolicLinkLocalizer, IQualifiedNameFilePathConverter filePathConverter) Returns the external property node typed element.- Parameters:
node- the external property comparison node, cannot benullsession- the comparison session, cannot benullside- the comparison side to get section typed element on, cannot benullcomparisonSideName- the comparison side name, cannot benullcompareConfiguration- the compare configuration, cannot benulltypedCreator- the typed element creator, cannot benullsymbolicLinkLocalizer- the symbolic link localizer, cannot benullfilePathConverter- the file path converter, cannot benull- Returns:
- the node typed element, may be
null
-
saveMergeSettings
public static void saveMergeSettings(IMergeRulePartialModelNode node, IPartialModel partialModel, PartialModelController partialModelController, File mergeResultFile) Saves the merge settings for the specified node.- Parameters:
node- the node to save settings for, cannot benullpartialModel- the partial model, cannot benullpartialModelController- the partial model controller, cannot benullmergeResultFile- the file containing merge result, cannot benull
-
saveMergeSettings
public static void saveMergeSettings(IMergeRulePartialModelNode node, IThreeSideTextMergeInput input, MergeRule newRule, IPartialModel partialModel, PartialModelController partialModelController) Saves the merge settings for the specified node.- Parameters:
node- the partial model node to save the merge settings for, cannot benullinput- the text merge input to get a new merge settings from, cannot benullnewRule- a new merge rule to set, cannot benullpartialModel- the partial model, cannot benullpartialModelController- the partial model controller, cannot benull
-