Package com.intellij.diff.requests

Class BinaryMergeRequestImpl

java.lang.Object

com.intellij.diff.merge.MergeRequest

com.intellij.diff.merge.ThreesideMergeRequest

com.intellij.diff.merge.BinaryMergeRequest

com.intellij.diff.requests.BinaryMergeRequestImpl

All Implemented Interfaces:

UserDataHolder

public class BinaryMergeRequestImpl
extends BinaryMergeRequest

Field Summary

Fields inherited from class com.intellij.diff.merge.MergeRequest

myUserDataHolder

Constructor Summary

Constructors

Constructor and Description
BinaryMergeRequestImpl(Project project, FileContent file, byte [] originalContent, java.util.List<DiffContent> contents, java.util.List<byte[]> byteContents, java.lang.String title, java.util.List<java.lang.String> contentTitles)

Method Summary

Modifier and Type	Method and Description
void	applyResult(MergeResult result) Called on conflict resolve end.
java.util.List<byte[]>	getByteContents()
java.util.List<DiffContent>	getContents() 3 contents: left - middle - right (local - base - server)
java.util.List<java.lang.String>	getContentTitles()
FileContent	getOutputContent()
java.lang.String	getTitle()

Methods inherited from class com.intellij.diff.merge.MergeRequest

getUserData, putUserData

Methods inherited from class java.lang.Object

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

Constructor Detail

BinaryMergeRequestImpl

public BinaryMergeRequestImpl(Project project,
                              FileContent file,
                              byte [] originalContent,
                              java.util.List<DiffContent> contents,
                              java.util.List<byte[]> byteContents,
                              java.lang.String title,
                              java.util.List<java.lang.String> contentTitles)

Method Detail

getOutputContent

public FileContent getOutputContent()

Specified by:

getOutputContent in class BinaryMergeRequest

getContents

public java.util.List<DiffContent> getContents()

Description copied from class: ThreesideMergeRequest

3 contents: left - middle - right (local - base - server)

Specified by:

getContents in class ThreesideMergeRequest

getByteContents

public java.util.List<byte[]> getByteContents()

Specified by:

getByteContents in class BinaryMergeRequest

getTitle

public java.lang.String getTitle()

Specified by:

getTitle in class MergeRequest

getContentTitles

public java.util.List<java.lang.String> getContentTitles()

Specified by:

getContentTitles in class ThreesideMergeRequest

Returns:

contents names. Should have same length as ThreesideMergeRequest.getContents() Titles could be null.

applyResult

public void applyResult(MergeResult result)

Description copied from class: MergeRequest

Called on conflict resolve end. Should be called exactly once for each request that was shown. MergeRequest should keep the initial state of its content and restore it on MergeResult.CANCEL

Specified by:

applyResult in class MergeRequest