Package com.intellij.openapi.diff.impl.mergeTool

Class MergeRequestImpl

java.lang.Object

com.intellij.openapi.diff.DiffRequest

com.intellij.openapi.diff.MergeRequest

com.intellij.openapi.diff.impl.mergeTool.MergeRequestImpl

Deprecated.

@Deprecated
public class MergeRequestImpl
extends MergeRequest

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	MergeRequestImpl.MergeContent Deprecated.

Constructor Summary

Constructors

Constructor and Description
MergeRequestImpl(java.lang.String left, MergeVersion base, java.lang.String right, Project project) Deprecated.
MergeRequestImpl(java.lang.String left, java.lang.String base, java.lang.String right, FileType type, Project project) Deprecated.

Method Summary

Modifier and Type	Method and Description
void	applyChanges() Deprecated.
DiffContent []	getContents() Deprecated.
java.lang.String[]	getContentTitles() Deprecated.
java.lang.String	getHelpId() Deprecated.
MergeRequestImpl.MergeContent	getMergeContent() Deprecated.
int	getResult() Deprecated. After the merge operation is completed, returns the exit code of the merge dialog.
DiffContent	getResultContent() Deprecated.
java.lang.String	getWindowTitle() Deprecated. Used as window title
void	restoreOriginalContent() Deprecated.
void	setHelpId(java.lang.String helpId) Deprecated. Specifies the ID of the help topic which is shown when the Help button is pressed.
void	setResult(int result) Deprecated.
void	setVersionTitles(java.lang.String[] versionTitles) Deprecated. Sets the titles of panes in the merge dialog.
void	setWindowTitle(java.lang.String windowTitle) Deprecated. Sets the title of the merge dialog.

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

addHint, getGroupKey, getHints, getOnOkRunnable, getProject, removeHint, setGroupKey, setOnOkRunnable

Methods inherited from class java.lang.Object

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

Constructor Detail

MergeRequestImpl

public MergeRequestImpl(java.lang.String left,
                        MergeVersion base,
                        java.lang.String right,
                        Project project)

Deprecated.

MergeRequestImpl

public MergeRequestImpl(java.lang.String left,
                        java.lang.String base,
                        java.lang.String right,
                        FileType type,
                        Project project)

Deprecated.

Method Detail

getContents

public DiffContent [] getContents()

Deprecated.

Specified by:

getContents in class DiffRequest

Returns:

contents to compare

getContentTitles

public java.lang.String[] getContentTitles()

Deprecated.

Specified by:

getContentTitles in class DiffRequest

Returns:

contents names. Should have same length as DiffRequest.getContents()

setVersionTitles

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

Deprecated.

Description copied from class: MergeRequest

Sets the titles of panes in the merge dialog.

Specified by:

setVersionTitles in class MergeRequest

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.

getWindowTitle

public java.lang.String getWindowTitle()

Deprecated.

Description copied from class: DiffRequest

Used as window title

Specified by:

getWindowTitle in class DiffRequest

setWindowTitle

public void setWindowTitle(java.lang.String windowTitle)

Deprecated.

Description copied from class: MergeRequest

Sets the title of the merge dialog.

Specified by:

setWindowTitle in class MergeRequest

Parameters:

windowTitle - The dialog title.

setResult

public void setResult(int result)

Deprecated.

applyChanges

public void applyChanges()

Deprecated.

getResult

public int getResult()

Deprecated.

Description copied from class: MergeRequest

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

Specified by:

getResult in class MergeRequest

Returns:

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

getMergeContent

public MergeRequestImpl.MergeContent getMergeContent()

Deprecated.

getResultContent

public DiffContent getResultContent()

Deprecated.

restoreOriginalContent

public void restoreOriginalContent()

Deprecated.

Specified by:

restoreOriginalContent in class MergeRequest

getHelpId

public java.lang.String getHelpId()

Deprecated.

setHelpId

public void setHelpId(java.lang.String helpId)

Deprecated.

Description copied from class: MergeRequest

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

Specified by:

setHelpId in class MergeRequest

Parameters:

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