Package com.intellij.diff.merge

Class TextMergeRequest

java.lang.Object

com.intellij.diff.merge.MergeRequest

com.intellij.diff.merge.ThreesideMergeRequest

com.intellij.diff.merge.TextMergeRequest

All Implemented Interfaces:

UserDataHolder

Direct Known Subclasses:

TextMergeRequestImpl

public abstract class TextMergeRequest
extends ThreesideMergeRequest

Field Summary

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

myUserDataHolder

Constructor Summary

Constructors

Constructor and Description
TextMergeRequest()

Method Summary

Modifier and Type	Method and Description
abstract java.util.List<DocumentContent>	getContents() 3 contents: left - middle - right (local - base - server)
abstract DocumentContent	getOutputContent()

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

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

TextMergeRequest

public TextMergeRequest()

Method Detail

getContents

public abstract java.util.List<DocumentContent> getContents()

Description copied from class: ThreesideMergeRequest

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

Specified by:

getContents in class ThreesideMergeRequest

getOutputContent

public abstract DocumentContent getOutputContent()

Specified by:

getOutputContent in class ThreesideMergeRequest