Package com.intellij.diff.merge

Class MergeContext

java.lang.Object

com.intellij.diff.merge.MergeContext

All Implemented Interfaces:

FocusableContext, UserDataHolder

Direct Known Subclasses:

MergeContextEx

public abstract class MergeContext
extends java.lang.Object
implements UserDataHolder, FocusableContext

Field Summary

Fields

Modifier and Type	Field and Description
protected UserDataHolderBase	myUserDataHolder

Constructor Summary

Constructors

Constructor and Description
MergeContext()

Method Summary

Modifier and Type	Method and Description
abstract void	finishMerge(MergeResult result) Called by MergeTool on conflict resolve end.
abstract Project	getProject()
<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

Methods inherited from interface com.intellij.diff.FocusableContext

isFocusedInWindow, requestFocusInWindow

Field Detail

myUserDataHolder

protected final UserDataHolderBase myUserDataHolder

Constructor Detail

MergeContext

public MergeContext()

Method Detail

getProject

public abstract Project getProject()

finishMerge

public abstract void finishMerge(MergeResult result)

Called by MergeTool on conflict resolve end. Should delegate to the MergeRequest.applyResult(MergeResult)

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.

See Also:

DiffUserDataKeys

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