Package com.intellij.openapi.diff

Class MergeRequest

java.lang.Object

com.intellij.openapi.diff.DiffRequest

com.intellij.openapi.diff.MergeRequest

Direct Known Subclasses:

MergeRequestImpl

Deprecated.

use MergeRequest instead

@Deprecated
public abstract class MergeRequest
extends DiffRequest

A request for a merge operation.

See Also:

DiffRequestFactory.createMergeRequest(java.lang.String, java.lang.String, java.lang.String, com.intellij.openapi.vfs.VirtualFile, com.intellij.openapi.project.Project, com.intellij.openapi.diff.ActionButtonPresentation, com.intellij.openapi.diff.ActionButtonPresentation)

Constructor Summary

Constructors

Modifier	Constructor and Description
protected	MergeRequest(Project project) Deprecated.

Method Summary

Modifier and Type	Method and Description
abstract int	getResult() Deprecated. After the merge operation is completed, returns the exit code of the merge dialog.
abstract void	restoreOriginalContent() Deprecated.
abstract void	setHelpId(java.lang.String helpId) Deprecated. Specifies the ID of the help topic which is shown when the Help button is pressed.
abstract void	setVersionTitles(java.lang.String[] versionTitles) Deprecated. Sets the titles of panes in the merge dialog.
abstract void	setWindowTitle(java.lang.String windowTitle) Deprecated. Sets the title of the merge dialog.

Methods inherited from class com.intellij.openapi.diff.DiffRequest

addHint, getContents, getContentTitles, getGroupKey, getHints, getOnOkRunnable, getProject, getWindowTitle, removeHint, setGroupKey, setOnOkRunnable

Methods inherited from class java.lang.Object

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

Constructor Detail

MergeRequest

protected MergeRequest(Project project)

Deprecated.

Method Detail

setVersionTitles

public abstract void setVersionTitles(java.lang.String[] versionTitles)

Deprecated.

Sets the titles of panes in the merge dialog.

Parameters:

versionTitles - Array of 3 strings. First string specifies left pane title, second string specifies middle pane (merged content) title, third string specifies right pane.

setWindowTitle

public abstract void setWindowTitle(java.lang.String windowTitle)

Deprecated.

Sets the title of the merge dialog.

Parameters:

windowTitle - The dialog title.

setHelpId

public abstract void setHelpId(java.lang.String helpId)

Deprecated.

Specifies the ID of the help topic which is shown when the Help button is pressed. If null, the Help button is not shown.

Parameters:

helpId - the ID of the help topic for the merge operation.

getResult

public abstract int getResult()

Deprecated.

After the merge operation is completed, returns the exit code of the merge dialog.

Returns:

DialogWrapper.OK_EXIT_CODE if the user accepted the merge, or a different value if the merge operation was cancelled.

restoreOriginalContent

public abstract void restoreOriginalContent()

Deprecated.