Package com.intellij.diff.comparison

Class ComparisonManager

java.lang.Object

com.intellij.diff.comparison.ComparisonManager

Direct Known Subclasses:

ComparisonManagerImpl

public abstract class ComparisonManager
extends java.lang.Object

Class for the text comparison CharSequences should to have '\n' as line separator

It's good idea not to compare String due to expensive subSequence() implementation. Use CharSequenceSubSequence.

Constructor Summary

Constructors

Constructor and Description
ComparisonManager()

Method Summary

Modifier and Type	Method and Description
abstract java.util.List<DiffFragment>	compareChars(java.lang.CharSequence text1, java.lang.CharSequence text2, ComparisonPolicy policy, ProgressIndicator indicator) Compare two texts by-char
abstract java.util.List<MergeLineFragment>	compareLines(java.lang.CharSequence text1, java.lang.CharSequence text2, java.lang.CharSequence text3, ComparisonPolicy policy, ProgressIndicator indicator) Compare three texts by-line (LEFT - BASE - RIGHT)
abstract java.util.List<LineFragment>	compareLines(java.lang.CharSequence text1, java.lang.CharSequence text2, ComparisonPolicy policy, ProgressIndicator indicator) Compare two texts by-line
abstract java.util.List<LineFragment>	compareLinesInner(java.lang.CharSequence text1, java.lang.CharSequence text2, ComparisonPolicy policy, ProgressIndicator indicator) Compare two texts by-line and then compare changed fragments by-word
abstract java.util.List<LineFragment>	compareLinesInner(java.lang.CharSequence text1, java.lang.CharSequence text2, java.util.List<LineFragment> lineFragments, ComparisonPolicy policy, ProgressIndicator indicator) Deprecated.
abstract java.util.List<DiffFragment>	compareWords(java.lang.CharSequence text1, java.lang.CharSequence text2, ComparisonPolicy policy, ProgressIndicator indicator) Compare two texts by-word
static ComparisonManager	getInstance()
abstract boolean	isEquals(java.lang.CharSequence text1, java.lang.CharSequence text2, ComparisonPolicy policy) Check if two texts are equal using ComparisonPolicy
abstract java.util.List<MergeLineFragment>	mergeLines(java.lang.CharSequence text1, java.lang.CharSequence text2, java.lang.CharSequence text3, ComparisonPolicy policy, ProgressIndicator indicator) Compare three texts by-line (LEFT - BASE - RIGHT) Do not actually skip "ignored" changes, but keep them from forming merge conflicts.
abstract java.util.List<LineFragment>	processBlocks(java.util.List<LineFragment> oldFragments, java.lang.CharSequence text1, java.lang.CharSequence text2, ComparisonPolicy policy, boolean squash, boolean trim)
abstract java.util.List<LineFragment>	squash(java.util.List<LineFragment> oldFragments) compareLinesInner() comparison can produce adjustment line chunks.

Methods inherited from class java.lang.Object

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

Constructor Detail

ComparisonManager

public ComparisonManager()

Method Detail

getInstance

public static ComparisonManager getInstance()

compareLines

public abstract java.util.List<LineFragment> compareLines(java.lang.CharSequence text1,
                                                          java.lang.CharSequence text2,
                                                          ComparisonPolicy policy,
                                                          ProgressIndicator indicator)
                                                   throws DiffTooBigException

Compare two texts by-line

Throws:

DiffTooBigException

compareLinesInner

public abstract java.util.List<LineFragment> compareLinesInner(java.lang.CharSequence text1,
                                                               java.lang.CharSequence text2,
                                                               ComparisonPolicy policy,
                                                               ProgressIndicator indicator)
                                                        throws DiffTooBigException

Compare two texts by-line and then compare changed fragments by-word

Throws:

DiffTooBigException

compareLinesInner

@Deprecated
public abstract java.util.List<LineFragment> compareLinesInner(java.lang.CharSequence text1,
                                                               java.lang.CharSequence text2,
                                                               java.util.List<LineFragment> lineFragments,
                                                               ComparisonPolicy policy,
                                                               ProgressIndicator indicator)
                                                        throws DiffTooBigException

Deprecated.

Throws:

DiffTooBigException

compareLines

public abstract java.util.List<MergeLineFragment> compareLines(java.lang.CharSequence text1,
                                                               java.lang.CharSequence text2,
                                                               java.lang.CharSequence text3,
                                                               ComparisonPolicy policy,
                                                               ProgressIndicator indicator)
                                                        throws DiffTooBigException

Compare three texts by-line (LEFT - BASE - RIGHT)

Throws:

DiffTooBigException

mergeLines

public abstract java.util.List<MergeLineFragment> mergeLines(java.lang.CharSequence text1,
                                                             java.lang.CharSequence text2,
                                                             java.lang.CharSequence text3,
                                                             ComparisonPolicy policy,
                                                             ProgressIndicator indicator)
                                                      throws DiffTooBigException

Compare three texts by-line (LEFT - BASE - RIGHT) Do not actually skip "ignored" changes, but keep them from forming merge conflicts.

Throws:

DiffTooBigException

compareWords

public abstract java.util.List<DiffFragment> compareWords(java.lang.CharSequence text1,
                                                          java.lang.CharSequence text2,
                                                          ComparisonPolicy policy,
                                                          ProgressIndicator indicator)
                                                   throws DiffTooBigException

Compare two texts by-word

Throws:

DiffTooBigException

compareChars

public abstract java.util.List<DiffFragment> compareChars(java.lang.CharSequence text1,
                                                          java.lang.CharSequence text2,
                                                          ComparisonPolicy policy,
                                                          ProgressIndicator indicator)
                                                   throws DiffTooBigException

Compare two texts by-char

Throws:

DiffTooBigException

isEquals

public abstract boolean isEquals(java.lang.CharSequence text1,
                                 java.lang.CharSequence text2,
                                 ComparisonPolicy policy)

Check if two texts are equal using ComparisonPolicy

squash

public abstract java.util.List<LineFragment> squash(java.util.List<LineFragment> oldFragments)

compareLinesInner() comparison can produce adjustment line chunks. This method allows to squash shem. ex: "A\nB" vs "A X\nB Y" will result to two LineFragments: [0, 1) - [0, 1) and [1, 2) - [1, 2) squash will produce a single fragment: [0, 2) - [0, 2)

processBlocks

public abstract java.util.List<LineFragment> processBlocks(java.util.List<LineFragment> oldFragments,
                                                           java.lang.CharSequence text1,
                                                           java.lang.CharSequence text2,
                                                           ComparisonPolicy policy,
                                                           boolean squash,
                                                           boolean trim)

Parameters:

trim - - if leading/trailing LineFragments with equal contents should be skipped

See Also:

squash(java.util.List<com.intellij.diff.fragments.LineFragment>)