Package com.intellij.diff.merge

Class BinaryMergeRequest

java.lang.Object

com.intellij.diff.merge.MergeRequest

com.intellij.diff.merge.ThreesideMergeRequest

com.intellij.diff.merge.BinaryMergeRequest

All Implemented Interfaces:

UserDataHolder

Direct Known Subclasses:

BinaryMergeRequestImpl

public abstract class BinaryMergeRequest
extends ThreesideMergeRequest

Field Summary

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

myUserDataHolder

Constructor Summary

Constructors

Constructor and Description
BinaryMergeRequest()

Method Summary

Modifier and Type	Method and Description
abstract java.util.List<byte[]>	getByteContents()
abstract FileContent	getOutputContent()

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

getContents, getContentTitles

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

applyResult, getTitle, getUserData, putUserData

Methods inherited from class java.lang.Object

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

Constructor Detail

BinaryMergeRequest

public BinaryMergeRequest()

Method Detail

getByteContents

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

getOutputContent

public abstract FileContent getOutputContent()

Specified by:

getOutputContent in class ThreesideMergeRequest