Package com.intellij.diff.tools.util.text

Class FineMergeLineFragmentImpl

java.lang.Object

com.intellij.diff.fragments.MergeLineFragmentImpl

com.intellij.diff.tools.util.text.FineMergeLineFragmentImpl

All Implemented Interfaces:

MergeLineFragment, FineMergeLineFragment

public class FineMergeLineFragmentImpl
extends MergeLineFragmentImpl
implements FineMergeLineFragment

Constructor Summary

Constructors

Constructor and Description
FineMergeLineFragmentImpl(MergeLineFragment fragment, MergeConflictType conflictType, MergeInnerDifferences innerDifferences)

Method Summary

Modifier and Type	Method and Description
MergeConflictType	getConflictType()
MergeInnerDifferences	getInnerFragments()

Methods inherited from class com.intellij.diff.fragments.MergeLineFragmentImpl

getEndLine, getStartLine

Methods inherited from class java.lang.Object

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

Methods inherited from interface com.intellij.diff.fragments.MergeLineFragment

getEndLine, getStartLine

Constructor Detail

FineMergeLineFragmentImpl

public FineMergeLineFragmentImpl(MergeLineFragment fragment,
                                 MergeConflictType conflictType,
                                 MergeInnerDifferences innerDifferences)

Method Detail

getConflictType

public MergeConflictType getConflictType()

Specified by:

getConflictType in interface FineMergeLineFragment

getInnerFragments

public MergeInnerDifferences getInnerFragments()

Specified by:

getInnerFragments in interface FineMergeLineFragment