Package com.intellij.openapi.diff

Class DiffRequestFactory

java.lang.Object

com.intellij.openapi.diff.DiffRequestFactory

Direct Known Subclasses:

DiffRequestFactoryImpl

Deprecated.

use DiffRequestFactory instead

@Deprecated
public abstract class DiffRequestFactory
extends java.lang.Object

Allows to initiate 3-way merge operations for multiple versions of content of a particular virtual file.

Constructor Summary

Constructors

Constructor and Description
DiffRequestFactory() Deprecated.

Method Summary

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

Methods inherited from class java.lang.Object

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

Constructor Detail

DiffRequestFactory

public DiffRequestFactory()

Deprecated.

Method Detail

getInstance

public static DiffRequestFactory getInstance()

Deprecated.

createMergeRequest

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

Deprecated.

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).

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 abstract MergeRequest create3WayDiffRequest(java.lang.String leftText,
                                                   java.lang.String rightText,
                                                   java.lang.String originalContent,
                                                   Project project,
                                                   ActionButtonPresentation okButtonPresentation,
                                                   ActionButtonPresentation cancelButtonPresentation)

Deprecated.

create3WayDiffRequest

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

Deprecated.