Package com.intellij.diff.merge

Class MergeRequest

java.lang.Object

com.intellij.diff.merge.MergeRequest

All Implemented Interfaces:

UserDataHolder

Direct Known Subclasses:

ApplyPatchMergeRequest, ThreesideMergeRequest

public abstract class MergeRequest
extends java.lang.Object
implements UserDataHolder

See Also:

DiffRequestFactory

Field Summary

Fields

Modifier and Type	Field and Description
protected UserDataHolderBase	myUserDataHolder

Constructor Summary

Constructors

Constructor and Description
MergeRequest()

Method Summary

Modifier and Type	Method and Description
abstract void	applyResult(MergeResult result) Called on conflict resolve end.
abstract java.lang.String	getTitle()
<T> T	getUserData(Key<T> key)
<T> void	putUserData(Key<T> key, T value) Add a new user data value to this object.

Methods inherited from class java.lang.Object

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

Field Detail

myUserDataHolder

protected final UserDataHolderBase myUserDataHolder

Constructor Detail

MergeRequest

public MergeRequest()

Method Detail

getTitle

public abstract java.lang.String getTitle()

applyResult

public abstract void applyResult(MergeResult result)

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

getUserData

public <T> T getUserData(Key<T> key)

Specified by:

getUserData in interface UserDataHolder

Returns:

a user data value associated with this object. Doesn't require read action.

putUserData

public <T> void putUserData(Key<T> key,
                            T value)

Description copied from interface: UserDataHolder

Add a new user data value to this object. Doesn't require write action.

Specified by:

putUserData in interface UserDataHolder