Package com.intellij.diff.merge

Class ErrorMergeTool

java.lang.Object

com.intellij.diff.merge.ErrorMergeTool

All Implemented Interfaces:

MergeTool

public class ErrorMergeTool
extends java.lang.Object
implements MergeTool

Nested Class Summary

Nested classes/interfaces inherited from interface com.intellij.diff.merge.MergeTool

MergeTool.MergeViewer, MergeTool.ToolbarComponents

Field Summary

Fields

Modifier and Type	Field and Description
static ErrorMergeTool	INSTANCE

Fields inherited from interface com.intellij.diff.merge.MergeTool

EP_NAME

Constructor Summary

Constructors

Constructor and Description
ErrorMergeTool()

Method Summary

Modifier and Type	Method and Description
boolean	canShow(MergeContext context, MergeRequest request)
MergeTool.MergeViewer	createComponent(MergeContext context, MergeRequest request) Creates viewer for the given request.

Methods inherited from class java.lang.Object

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

Field Detail

INSTANCE

public static final ErrorMergeTool INSTANCE

Constructor Detail

ErrorMergeTool

public ErrorMergeTool()

Method Detail

createComponent

public MergeTool.MergeViewer createComponent(MergeContext context,
                                             MergeRequest request)

Description copied from interface: MergeTool

Creates viewer for the given request. Clients should call MergeTool.canShow(MergeContext, MergeRequest) first.

Specified by:

createComponent in interface MergeTool

canShow

public boolean canShow(MergeContext context,
                       MergeRequest request)

Specified by:

canShow in interface MergeTool