Package com.intellij.diff.merge

Class TextMergeViewer

java.lang.Object

com.intellij.diff.merge.TextMergeViewer

All Implemented Interfaces:

MergeTool.MergeViewer, Disposable

public class TextMergeViewer
extends java.lang.Object
implements MergeTool.MergeViewer

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
class	TextMergeViewer.MyThreesideViewer

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

Disposable.Parent

Constructor Summary

Constructors

Constructor and Description
TextMergeViewer(MergeContext context, TextMergeRequest request)

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)
TextMergeViewer.MyThreesideViewer	getViewer()
MergeTool.ToolbarComponents	init() Should be called after adding MergeTool.MergeViewer.getComponent() to the components hierarchy.

Methods inherited from class java.lang.Object

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

Constructor Detail

TextMergeViewer

public TextMergeViewer(MergeContext context,
                       TextMergeRequest request)

Method Detail

getComponent

public javax.swing.JComponent getComponent()

Specified by:

getComponent in interface MergeTool.MergeViewer

getPreferredFocusedComponent

public javax.swing.JComponent getPreferredFocusedComponent()

Specified by:

getPreferredFocusedComponent in interface MergeTool.MergeViewer

init

public MergeTool.ToolbarComponents init()

Description copied from interface: MergeTool.MergeViewer

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

Specified by:

init in interface MergeTool.MergeViewer

getResolveAction

public javax.swing.Action getResolveAction(MergeResult result)

Specified by:

getResolveAction in interface MergeTool.MergeViewer

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

dispose

public void dispose()

Description copied from interface: Disposable

Usually not invoked directly, see class javadoc.

Specified by:

dispose in interface MergeTool.MergeViewer

Specified by:

dispose in interface Disposable

getViewer

public TextMergeViewer.MyThreesideViewer getViewer()