Package com.intellij.diff.merge

Interface MergeTool.MergeViewer

All Superinterfaces:

Disposable

All Known Implementing Classes:

BinaryMergeTool.BinaryMergeViewer, TextMergeViewer

Enclosing interface:

MergeTool

public static interface MergeTool.MergeViewer
extends Disposable

Merge viewer should call MergeContext.finishMerge(MergeResult) when processing is over. MergeRequest.applyResult(MergeResult) will be performed by the caller, so it shouldn't be called by MergeViewer directly.

Nested Class Summary

Nested classes/interfaces inherited from interface com.intellij.openapi.Disposable

Disposable.Parent

Method Summary

Modifier and Type	Method and Description
void	dispose() Usually not invoked directly, see class javadoc.
javax.swing.JComponent	getComponent()
javax.swing.JComponent	getPreferredFocusedComponent()
javax.swing.Action	getResolveAction(MergeResult result)
MergeTool.ToolbarComponents	init() Should be called after adding getComponent() to the components hierarchy.

Method Detail

getComponent

javax.swing.JComponent getComponent()

getPreferredFocusedComponent

javax.swing.JComponent getPreferredFocusedComponent()

getResolveAction

javax.swing.Action getResolveAction(MergeResult result)

Returns:

Action that should be triggered on the corresponding action.

Typical implementation can perform some checks and either call finishMerge(result) or do nothing

return null if action is not available

init

MergeTool.ToolbarComponents init()

Should be called after adding getComponent() to the components hierarchy.

dispose

void dispose()

Description copied from interface: Disposable

Usually not invoked directly, see class javadoc.

Specified by:

dispose in interface Disposable