Package com.intellij.diff

Class DiffRequestFactory

java.lang.Object

com.intellij.diff.DiffRequestFactory

Direct Known Subclasses:

DiffRequestFactoryImpl

public abstract class DiffRequestFactory
extends java.lang.Object

Use ProgressManager.executeProcessUnderProgress() to pass modality state if needed

Constructor Summary

Constructors

Constructor and Description
DiffRequestFactory()

Method Summary

Modifier and Type	Method and Description
abstract 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)
abstract ContentDiffRequest	createClipboardVsValue(java.lang.String value)
abstract ContentDiffRequest	createFromFiles(Project project, VirtualFile file1, VirtualFile file2)
abstract ContentDiffRequest	createFromFiles(Project project, VirtualFile leftFile, VirtualFile baseFile, VirtualFile rightFile)
abstract MergeRequest	createMergeRequest(Project project, FileType fileType, Document output, java.util.List<java.lang.String> textContents, java.lang.String title, java.util.List<java.lang.String> titles, Consumer<? super MergeResult> applyCallback)
abstract MergeRequest	createMergeRequest(Project project, VirtualFile output, java.util.List<byte[]> byteContents, java.lang.String title, java.util.List<java.lang.String> contentTitles)
abstract 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)
abstract MergeRequest	createMergeRequestFromFiles(Project project, VirtualFile output, java.util.List<? extends VirtualFile> contents, Consumer<? super MergeResult> applyCallback)
abstract MergeRequest	createMergeRequestFromFiles(Project project, VirtualFile output, java.util.List<? extends VirtualFile> contents, java.lang.String title, java.util.List<java.lang.String> contentTitles, Consumer<? super MergeResult> applyCallback)
abstract 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)
abstract TextMergeRequest	createTextMergeRequestFromFiles(Project project, VirtualFile output, java.util.List<? extends VirtualFile> contents, java.lang.String title, java.util.List<java.lang.String> contentTitles, Consumer<? super MergeResult> applyCallback)
abstract java.lang.String	getContentTitle(VirtualFile file)
static DiffRequestFactory	getInstance()
abstract java.lang.String	getTitle(VirtualFile file)
abstract java.lang.String	getTitle(VirtualFile file1, VirtualFile file2)

Methods inherited from class java.lang.Object

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

Constructor Detail

DiffRequestFactory

public DiffRequestFactory()

Method Detail

getInstance

public static DiffRequestFactory getInstance()

createFromFiles

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

createFromFiles

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

createClipboardVsValue

public abstract ContentDiffRequest createClipboardVsValue(java.lang.String value)

getContentTitle

public abstract java.lang.String getContentTitle(VirtualFile file)

getTitle

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

getTitle

public abstract java.lang.String getTitle(VirtualFile file)

createMergeRequest

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

Throws:

InvalidDiffRequestException

createMergeRequest

public abstract 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

Throws:

InvalidDiffRequestException

createMergeRequest

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

Throws:

InvalidDiffRequestException

createTextMergeRequest

public abstract 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

Throws:

InvalidDiffRequestException

createBinaryMergeRequest

public abstract 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

Throws:

InvalidDiffRequestException

createMergeRequestFromFiles

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

Throws:

InvalidDiffRequestException

createMergeRequestFromFiles

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

Throws:

InvalidDiffRequestException

createTextMergeRequestFromFiles

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

Throws:

InvalidDiffRequestException