Package com.intellij.diff.merge

Class ThreesideMergeRequest

java.lang.Object

com.intellij.diff.merge.MergeRequest

com.intellij.diff.merge.ThreesideMergeRequest

All Implemented Interfaces:

UserDataHolder

Direct Known Subclasses:

BinaryMergeRequest, TextMergeRequest

public abstract class ThreesideMergeRequest
extends MergeRequest

Field Summary

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

myUserDataHolder

Constructor Summary

Constructors

Constructor and Description
ThreesideMergeRequest()

Method Summary

Modifier and Type	Method and Description
abstract java.util.List<? extends DiffContent>	getContents() 3 contents: left - middle - right (local - base - server)
abstract java.util.List<java.lang.String>	getContentTitles()
abstract DiffContent	getOutputContent()

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

ThreesideMergeRequest

public ThreesideMergeRequest()

Method Detail

getContents

public abstract java.util.List<? extends DiffContent> getContents()

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

getOutputContent

public abstract DiffContent getOutputContent()

getContentTitles

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

Returns:

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