com.ibm.xtools.umldt.rt.api.egit.merge

Interface RTEGitMergeToolCommand

  • All Superinterfaces:
    RTAbstractCommand
    All Known Implementing Classes:
    RTEGitMergeToolCommandImpl


    public interface RTEGitMergeToolCommand
    extends RTAbstractCommand
    Defines command for starting merge tool.

    The merge tool is started on selection.

    • If selection is not provided and merge tool type is Closure or Auto, then merge tool will be started on all RT models in the workspace.
    • If selection is File[] and autoImport is on, then command will attempt to import missing projects into workspace and then find conflicting resources in the workspace. Merge tool will be started only on files imported into workspace.
    • If selection is File[] and autoImport is off, then expected merge tool type is FileByFile or Auto.
    The default merge tool type is Auto.

    The command is executed asynchronously and can be called from UI or non-UI threads but non-UI thread is preferred. Client can use callback via setCompletionCallback(MergeToolCallback callback)to track when merge tool was closed.

    Author:
    seroshki
    • Method Detail

      • setSelection

        RTEGitMergeToolCommand setSelection(org.eclipse.core.resources.IResource[] resources)
        Initialize current selection using array of IResource.
        Parameters:
        resources -
      • setSelection

        RTEGitMergeToolCommand setSelection(File[] files)
        Initialize current selection using array of File.
        Parameters:
        file - - array of files in Git repository with absolute or repository-relative paths
      • setFilter

        RTEGitMergeToolCommand setFilter(String filter)
        Set filter for selection. Only resources matching filter will be processed
        Parameters:
        filter - - comma-separated list of workspace or repository-relative paths. Path can contain ? and * symbols.
      • setAutoImport

        RTEGitMergeToolCommand setAutoImport(boolean autoImport)
        Perform auto-import of missing projects.

        Default value: false

        Parameters:
        autoImport - - boolean
      • setSparseMode

        RTEGitMergeToolCommand setSparseMode(boolean sparseMode)
        Enables sparse mode.

        Sparse mode allows to load only modified files when starting Compare/Merge session.

        Default value: true

        Parameters:
        sparseMode - - boolean