Package com.intellij.diff

Class DiffRequestFactoryImpl

java.lang.Object

com.intellij.diff.DiffRequestFactory

com.intellij.diff.DiffRequestFactoryImpl

public class DiffRequestFactoryImpl
extends DiffRequestFactory

Field Summary

Fields

Modifier and Type	Field and Description
static java.lang.String	DIFF_TITLE_RENAME_SEPARATOR

Constructor Summary

Constructors

Constructor and Description
DiffRequestFactoryImpl()

Method Summary

Modifier and Type	Method and Description
MergeRequest	createBinaryMergeRequest(Project project, VirtualFile output, java.util.List<byte[]> byteContents, java.lang.String title, java.util.List<java.lang.String> contentTitles, Consumer<? super MergeResult> applyCallback)
MergeRequest	createBinaryMergeRequestFromFiles(Project project, VirtualFile output, java.util.List<? extends VirtualFile> fileContents, java.lang.String title, java.util.List<java.lang.String> contentTitles, Consumer<? super MergeResult> applyCallback)
ContentDiffRequest	createClipboardVsValue(java.lang.String value)
ContentDiffRequest	createFromFiles(Project project, VirtualFile file1, VirtualFile file2)
ContentDiffRequest	createFromFiles(Project project, VirtualFile leftFile, VirtualFile baseFile, VirtualFile rightFile)
MergeRequest	createMergeRequest(Project project, FileType fileType, Document outputDocument, java.util.List<java.lang.String> textContents, java.lang.String title, java.util.List<java.lang.String> titles, Consumer<? super MergeResult> applyCallback)
MergeRequest	createMergeRequest(Project project, VirtualFile output, java.util.List<byte[]> byteContents, java.lang.String title, java.util.List<java.lang.String> contentTitles)
MergeRequest	createMergeRequest(Project project, VirtualFile output, java.util.List<byte[]> byteContents, java.lang.String title, java.util.List<java.lang.String> contentTitles, Consumer<? super MergeResult> applyCallback)
MergeRequest	createMergeRequestFromFiles(Project project, VirtualFile output, java.util.List<? extends VirtualFile> fileContents, Consumer<? super MergeResult> applyCallback)
MergeRequest	createMergeRequestFromFiles(Project project, VirtualFile output, java.util.List<? extends VirtualFile> fileContents, java.lang.String title, java.util.List<java.lang.String> contentTitles, Consumer<? super MergeResult> applyCallback)
TextMergeRequest	createTextMergeRequest(Project project, VirtualFile output, java.util.List<byte[]> byteContents, java.lang.String title, java.util.List<java.lang.String> contentTitles, Consumer<? super MergeResult> applyCallback)
TextMergeRequest	createTextMergeRequestFromFiles(Project project, VirtualFile output, java.util.List<? extends VirtualFile> fileContents, java.lang.String title, java.util.List<java.lang.String> contentTitles, Consumer<? super MergeResult> applyCallback)
static java.lang.String	getContentTitle(FilePath path)
java.lang.String	getContentTitle(VirtualFile file)
static java.lang.String	getTitle(FilePath path1, FilePath path2, java.lang.String separator)
java.lang.String	getTitle(VirtualFile file)
java.lang.String	getTitle(VirtualFile file1, VirtualFile file2)

Methods inherited from class com.intellij.diff.DiffRequestFactory

getInstance

Methods inherited from class java.lang.Object

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

Field Detail

DIFF_TITLE_RENAME_SEPARATOR

public static final java.lang.String DIFF_TITLE_RENAME_SEPARATOR

See Also:

Constant Field Values

Constructor Detail

DiffRequestFactoryImpl

public DiffRequestFactoryImpl()

Method Detail

createFromFiles

public ContentDiffRequest createFromFiles(Project project,
                                          VirtualFile file1,
                                          VirtualFile file2)

Specified by:

createFromFiles in class DiffRequestFactory

createFromFiles

public ContentDiffRequest createFromFiles(Project project,
                                          VirtualFile leftFile,
                                          VirtualFile baseFile,
                                          VirtualFile rightFile)

Specified by:

createFromFiles in class DiffRequestFactory

createClipboardVsValue

public ContentDiffRequest createClipboardVsValue(java.lang.String value)

Specified by:

createClipboardVsValue in class DiffRequestFactory

getContentTitle

public java.lang.String getContentTitle(VirtualFile file)

Specified by:

getContentTitle in class DiffRequestFactory

getTitle

public java.lang.String getTitle(VirtualFile file1,
                                 VirtualFile file2)

Specified by:

getTitle in class DiffRequestFactory

getTitle

public java.lang.String getTitle(VirtualFile file)

Specified by:

getTitle in class DiffRequestFactory

getContentTitle

public static java.lang.String getContentTitle(FilePath path)

getTitle

public static java.lang.String getTitle(FilePath path1,
                                        FilePath path2,
                                        java.lang.String separator)

createMergeRequest

public MergeRequest createMergeRequest(Project project,
                                       FileType fileType,
                                       Document outputDocument,
                                       java.util.List<java.lang.String> textContents,
                                       java.lang.String title,
                                       java.util.List<java.lang.String> titles,
                                       Consumer<? super MergeResult> applyCallback)
                                throws InvalidDiffRequestException

Specified by:

createMergeRequest in class DiffRequestFactory

Throws:

InvalidDiffRequestException

createMergeRequest

public MergeRequest createMergeRequest(Project project,
                                       VirtualFile output,
                                       java.util.List<byte[]> byteContents,
                                       java.lang.String title,
                                       java.util.List<java.lang.String> contentTitles,
                                       Consumer<? super MergeResult> applyCallback)
                                throws InvalidDiffRequestException

Specified by:

createMergeRequest in class DiffRequestFactory

Throws:

InvalidDiffRequestException

createMergeRequest

public MergeRequest createMergeRequest(Project project,
                                       VirtualFile output,
                                       java.util.List<byte[]> byteContents,
                                       java.lang.String title,
                                       java.util.List<java.lang.String> contentTitles)
                                throws InvalidDiffRequestException

Specified by:

createMergeRequest in class DiffRequestFactory

Throws:

InvalidDiffRequestException

createTextMergeRequest

public TextMergeRequest createTextMergeRequest(Project project,
                                               VirtualFile output,
                                               java.util.List<byte[]> byteContents,
                                               java.lang.String title,
                                               java.util.List<java.lang.String> contentTitles,
                                               Consumer<? super MergeResult> applyCallback)
                                        throws InvalidDiffRequestException

Specified by:

createTextMergeRequest in class DiffRequestFactory

Throws:

InvalidDiffRequestException

createBinaryMergeRequest

public MergeRequest createBinaryMergeRequest(Project project,
                                             VirtualFile output,
                                             java.util.List<byte[]> byteContents,
                                             java.lang.String title,
                                             java.util.List<java.lang.String> contentTitles,
                                             Consumer<? super MergeResult> applyCallback)
                                      throws InvalidDiffRequestException

Specified by:

createBinaryMergeRequest in class DiffRequestFactory

Throws:

InvalidDiffRequestException

createMergeRequestFromFiles

public MergeRequest createMergeRequestFromFiles(Project project,
                                                VirtualFile output,
                                                java.util.List<? extends VirtualFile> fileContents,
                                                Consumer<? super MergeResult> applyCallback)
                                         throws InvalidDiffRequestException

Specified by:

createMergeRequestFromFiles in class DiffRequestFactory

Throws:

InvalidDiffRequestException

createMergeRequestFromFiles

public MergeRequest createMergeRequestFromFiles(Project project,
                                                VirtualFile output,
                                                java.util.List<? extends VirtualFile> fileContents,
                                                java.lang.String title,
                                                java.util.List<java.lang.String> contentTitles,
                                                Consumer<? super MergeResult> applyCallback)
                                         throws InvalidDiffRequestException

Specified by:

createMergeRequestFromFiles in class DiffRequestFactory

Throws:

InvalidDiffRequestException

createTextMergeRequestFromFiles

public TextMergeRequest createTextMergeRequestFromFiles(Project project,
                                                        VirtualFile output,
                                                        java.util.List<? extends VirtualFile> fileContents,
                                                        java.lang.String title,
                                                        java.util.List<java.lang.String> contentTitles,
                                                        Consumer<? super MergeResult> applyCallback)
                                                 throws InvalidDiffRequestException

Specified by:

createTextMergeRequestFromFiles in class DiffRequestFactory

Throws:

InvalidDiffRequestException

createBinaryMergeRequestFromFiles

public MergeRequest createBinaryMergeRequestFromFiles(Project project,
                                                      VirtualFile output,
                                                      java.util.List<? extends VirtualFile> fileContents,
                                                      java.lang.String title,
                                                      java.util.List<java.lang.String> contentTitles,
                                                      Consumer<? super MergeResult> applyCallback)
                                               throws InvalidDiffRequestException

Throws:

InvalidDiffRequestException