Package com.intellij.diff.merge

Class TextMergeChange

java.lang.Object

com.intellij.diff.tools.simple.ThreesideDiffChangeBase

com.intellij.diff.merge.TextMergeChange

public class TextMergeChange
extends ThreesideDiffChangeBase

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	TextMergeChange.State

Field Summary

Fields inherited from class com.intellij.diff.tools.simple.ThreesideDiffChangeBase

myHighlighters, myInnerHighlighters, myOperations

Constructor Summary

Constructors

Constructor and Description
TextMergeChange(int index, MergeLineFragment fragment, MergeConflictType conflictType, TextMergeViewer viewer)

Method Summary

Modifier and Type	Method and Description
protected Editor	getEditor(ThreeSide side)
int	getEndLine()
int	getEndLine(ThreeSide side)
MergeLineFragment	getFragment()
int	getIndex()
protected MergeInnerDifferences	getInnerFragments()
int	getStartLine()
int	getStartLine(ThreeSide side)
protected void	installOperations()
boolean	isOnesideAppliedConflict()
boolean	isResolved()
boolean	isResolved(Side side)
boolean	isResolved(ThreeSide side)
void	markOnesideAppliedConflict()
void	reinstallHighlighters()
void	setInnerFragments(MergeInnerDifferences innerFragments)

Methods inherited from class com.intellij.diff.tools.simple.ThreesideDiffChangeBase

createHighlighter, createInnerHighlighter, destroy, destroyHighlighters, destroyInnerHighlighters, destroyOperations, getDiffType, getType, installHighlighters, installInnerHighlighters, isChange, isChange, isConflict, updateGutterActions

Methods inherited from class java.lang.Object

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

Constructor Detail

TextMergeChange

public TextMergeChange(int index,
                       MergeLineFragment fragment,
                       MergeConflictType conflictType,
                       TextMergeViewer viewer)

Method Detail

reinstallHighlighters

public void reinstallHighlighters()

getIndex

public int getIndex()

isResolved

public boolean isResolved()

isResolved

public boolean isResolved(Side side)

isOnesideAppliedConflict

public boolean isOnesideAppliedConflict()

markOnesideAppliedConflict

public void markOnesideAppliedConflict()

isResolved

public boolean isResolved(ThreeSide side)

Specified by:

isResolved in class ThreesideDiffChangeBase

getStartLine

public int getStartLine()

getEndLine

public int getEndLine()

getStartLine

public int getStartLine(ThreeSide side)

Specified by:

getStartLine in class ThreesideDiffChangeBase

getEndLine

public int getEndLine(ThreeSide side)

Specified by:

getEndLine in class ThreesideDiffChangeBase

getEditor

protected Editor getEditor(ThreeSide side)

Specified by:

getEditor in class ThreesideDiffChangeBase

getInnerFragments

protected MergeInnerDifferences getInnerFragments()

Specified by:

getInnerFragments in class ThreesideDiffChangeBase

getFragment

public MergeLineFragment getFragment()

setInnerFragments

public void setInnerFragments(MergeInnerDifferences innerFragments)

installOperations

protected void installOperations()

Overrides:

installOperations in class ThreesideDiffChangeBase