Package com.intellij.diff.tools.simple

Class SimpleThreesideDiffChange

java.lang.Object

com.intellij.diff.tools.simple.ThreesideDiffChangeBase

com.intellij.diff.tools.simple.SimpleThreesideDiffChange

public class SimpleThreesideDiffChange
extends ThreesideDiffChangeBase

Field Summary

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

myHighlighters, myInnerHighlighters, myOperations

Constructor Summary

Constructors

Constructor and Description
SimpleThreesideDiffChange(MergeLineFragment fragment, MergeConflictType conflictType, MergeInnerDifferences innerFragments, SimpleThreesideDiffViewer viewer)

Method Summary

Modifier and Type	Method and Description
protected Editor	getEditor(ThreeSide side)
int	getEndLine(ThreeSide side)
protected MergeInnerDifferences	getInnerFragments()
int	getStartLine(ThreeSide side)
protected void	installOperations()
boolean	isResolved(ThreeSide side)
boolean	isValid()
void	markInvalid()
boolean	processChange(int oldLine1, int oldLine2, int shift, ThreeSide side)
void	reinstallHighlighters()

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

SimpleThreesideDiffChange

public SimpleThreesideDiffChange(MergeLineFragment fragment,
                                 MergeConflictType conflictType,
                                 MergeInnerDifferences innerFragments,
                                 SimpleThreesideDiffViewer viewer)

Method Detail

reinstallHighlighters

public void reinstallHighlighters()

installOperations

protected void installOperations()

Overrides:

installOperations in class ThreesideDiffChangeBase

getStartLine

public int getStartLine(ThreeSide side)

Specified by:

getStartLine in class ThreesideDiffChangeBase

getEndLine

public int getEndLine(ThreeSide side)

Specified by:

getEndLine in class ThreesideDiffChangeBase

isResolved

public boolean isResolved(ThreeSide side)

Specified by:

isResolved 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

isValid

public boolean isValid()

markInvalid

public void markInvalid()

processChange

public boolean processChange(int oldLine1,
                             int oldLine2,
                             int shift,
                             ThreeSide side)