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

Class DiffRequestFactoryImpl

java.lang.Object

com.intellij.openapi.diff.DiffRequestFactory

com.intellij.openapi.diff.impl.mergeTool.DiffRequestFactoryImpl

public class DiffRequestFactoryImpl
extends DiffRequestFactory

Constructor Summary

Constructors

Constructor and Description
DiffRequestFactoryImpl()

Method Summary

Modifier and Type	Method and Description
MergeRequest	create3WayDiffRequest(java.lang.String leftText, java.lang.String rightText, java.lang.String originalContent, FileType type, Project project, ActionButtonPresentation okButtonPresentation, ActionButtonPresentation cancelButtonPresentation)
MergeRequest	create3WayDiffRequest(java.lang.String leftText, java.lang.String rightText, java.lang.String originalContent, Project project, ActionButtonPresentation okButtonPresentation, ActionButtonPresentation cancelButtonPresentation)
MergeRequest	createMergeRequest(java.lang.String leftText, java.lang.String rightText, java.lang.String originalContent, VirtualFile file, Project project, ActionButtonPresentation okButtonPresentation, ActionButtonPresentation cancelButtonPresentation) Creates a request for a merge operation.

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

getInstance

Methods inherited from class java.lang.Object

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

Constructor Detail

DiffRequestFactoryImpl

public DiffRequestFactoryImpl()

Method Detail

createMergeRequest

public MergeRequest createMergeRequest(java.lang.String leftText,
                                       java.lang.String rightText,
                                       java.lang.String originalContent,
                                       VirtualFile file,
                                       Project project,
                                       ActionButtonPresentation okButtonPresentation,
                                       ActionButtonPresentation cancelButtonPresentation)

Description copied from class: DiffRequestFactory

Creates a request for a merge operation. To execute the request, obtain the diff tool instance by calling DiffManager.getDiffTool() and then call DiffTool.show(DiffRequest).

Specified by:

createMergeRequest in class DiffRequestFactory

Parameters:

leftText - First of the changed versions of the content (to be displayed in the left pane).

rightText - Second of the changed versions of the content (to be displayed in the right pane).

originalContent - The version of the content before changes.

file - The file which is being merged.

project - The project in the context of which the operation is executed.

okButtonPresentation - Parameter ignored.

cancelButtonPresentation - Parameter ignored.

Returns:

The merge operation request.

create3WayDiffRequest

public MergeRequest create3WayDiffRequest(java.lang.String leftText,
                                          java.lang.String rightText,
                                          java.lang.String originalContent,
                                          FileType type,
                                          Project project,
                                          ActionButtonPresentation okButtonPresentation,
                                          ActionButtonPresentation cancelButtonPresentation)

Specified by:

create3WayDiffRequest in class DiffRequestFactory

create3WayDiffRequest

public MergeRequest create3WayDiffRequest(java.lang.String leftText,
                                          java.lang.String rightText,
                                          java.lang.String originalContent,
                                          Project project,
                                          ActionButtonPresentation okButtonPresentation,
                                          ActionButtonPresentation cancelButtonPresentation)

Specified by:

create3WayDiffRequest in class DiffRequestFactory