Top Description Fields Constructors Methods
org.eclipse.jgit.internal.diffmergetool

public Class PreDefinedMergeTool

extends UserDefinedMergeTool
Class Inheritance
Imports
org.eclipse.jgit.lib.internal.BooleanTriState
The pre-defined merge tool.

Field Summary

Modifier and TypeField and Description
private final String
parametersWithoutBase

the tool parameters without base

Constructor Summary

AccessConstructor and Description
public
PreDefinedMergeTool(String
the name
name, String
the path
path, String
the tool parameters that are used together with path as command and "base is present" ($BASE)
parametersWithBase, String
the tool parameters that are used together with path as command and "base is present" ($BASE)
parametersWithoutBase, BooleanTriState
the "trust exit code" option
trustExitCode)

Creates the pre-defined merge tool

public
PreDefinedMergeTool(CommandLineMergeTool
the command line merge tool
tool)

Creates the pre-defined merge tool

Method Summary

Modifier and TypeMethod and Description
public String

Returns:

the tool command (with base present)
getCommand()

Overrides org.eclipse.jgit.internal.diffmergetool.UserDefinedDiffTool.getCommand.

Implements org.eclipse.jgit.internal.diffmergetool.ExternalDiffTool.getCommand.

Get tool command

public String

Returns:

the tool command
getCommand(boolean
get command with base present (true) or without base present (false)
withBase)

Overrides org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTool.getCommand.

Implements org.eclipse.jgit.internal.diffmergetool.ExternalMergeTool.getCommand.

Get command

public void
setTrustExitCode(BooleanTriState
the "trust exit code" option
trustExitCode)

Overrides org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTool.setTrustExitCode.

Set "trust exit code" flag

Inherited from org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTool:
getTrustExitCode

Field Detail

parametersWithoutBaseback to summary
private final String parametersWithoutBase

the tool parameters without base

Constructor Detail

PreDefinedMergeToolback to summary
public PreDefinedMergeTool(String name, String path, String parametersWithBase, String parametersWithoutBase, BooleanTriState trustExitCode)

Creates the pre-defined merge tool

Parameters
name:String

the name

path:String

the path

parametersWithBase:String

the tool parameters that are used together with path as command and "base is present" ($BASE)

parametersWithoutBase:String

the tool parameters that are used together with path as command and "base is present" ($BASE)

trustExitCode:BooleanTriState

the "trust exit code" option

PreDefinedMergeToolback to summary
public PreDefinedMergeTool(CommandLineMergeTool tool)

Creates the pre-defined merge tool

Parameters
tool:CommandLineMergeTool

the command line merge tool

Method Detail

getCommandback to summary
public String getCommand()

Overrides org.eclipse.jgit.internal.diffmergetool.UserDefinedDiffTool.getCommand.

Implements org.eclipse.jgit.internal.diffmergetool.ExternalDiffTool.getCommand.

Doc from org.eclipse.jgit.internal.diffmergetool.ExternalDiffTool.getCommand.

Get tool command

Returns:String

the tool command (with base present)

Annotations
@Override
getCommandback to summary
public String getCommand(boolean withBase)

Overrides org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTool.getCommand.

Implements org.eclipse.jgit.internal.diffmergetool.ExternalMergeTool.getCommand.

Doc from org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTool.getCommand.

Get command

Parameters
withBase:boolean

get command with base present (true) or without base present (false)

Returns:String

the tool command

Annotations
@Override
setTrustExitCodeback to summary
public void setTrustExitCode(BooleanTriState trustExitCode)

Overrides org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTool.setTrustExitCode.

Doc from org.eclipse.jgit.internal.diffmergetool.UserDefinedMergeTool.setTrustExitCode.

Set "trust exit code" flag

Parameters
trustExitCode:BooleanTriState

the "trust exit code" option

Annotations
@Override