Package com.intellij.diff.comparison

Class ComparisonManagerImpl

java.lang.Object

com.intellij.diff.comparison.ComparisonManager

com.intellij.diff.comparison.ComparisonManagerImpl

public class ComparisonManagerImpl
extends ComparisonManager

Constructor Summary

Constructors

Constructor and Description
ComparisonManagerImpl()

Method Summary

Modifier and Type	Method and Description
static java.util.BitSet	collectIgnoredRanges(java.util.List<? extends TextRange> ignoredRanges)
java.util.List<DiffFragment>	compareChars(java.lang.CharSequence text1, java.lang.CharSequence text2, ComparisonPolicy policy, ProgressIndicator indicator) Compare two texts by-char
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)
java.util.List<LineFragment>	compareLines(java.lang.CharSequence text1, java.lang.CharSequence text2, ComparisonPolicy policy, ProgressIndicator indicator) Compare two texts by-line
java.util.List<LineFragment>	compareLines(java.lang.CharSequence text1, java.lang.CharSequence text2, LineOffsets lineOffsets1, LineOffsets lineOffsets2, ComparisonPolicy policy, ProgressIndicator indicator)
java.util.List<LineFragment>	compareLines(Range range, java.lang.CharSequence text1, java.lang.CharSequence text2, LineOffsets lineOffsets1, LineOffsets lineOffsets2, ComparisonPolicy policy, ProgressIndicator indicator)
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
java.util.List<LineFragment>	compareLinesInner(java.lang.CharSequence text1, java.lang.CharSequence text2, LineOffsets lineOffsets1, LineOffsets lineOffsets2, ComparisonPolicy policy, InnerFragmentsPolicy fragmentsPolicy, ProgressIndicator indicator)
java.util.List<LineFragment>	compareLinesInner(java.lang.CharSequence text1, java.lang.CharSequence text2, java.util.List<LineFragment> lineFragments, ComparisonPolicy policy, ProgressIndicator indicator) Deprecated.
java.util.List<LineFragment>	compareLinesInner(Range range, java.lang.CharSequence text1, java.lang.CharSequence text2, LineOffsets lineOffsets1, LineOffsets lineOffsets2, ComparisonPolicy policy, boolean innerFragments, ProgressIndicator indicator)
java.util.List<LineFragment>	compareLinesInner(Range range, java.lang.CharSequence text1, java.lang.CharSequence text2, LineOffsets lineOffsets1, LineOffsets lineOffsets2, ComparisonPolicy policy, InnerFragmentsPolicy fragmentsPolicy, ProgressIndicator indicator)
java.util.List<LineFragment>	compareLinesWithIgnoredRanges(java.lang.CharSequence text1, java.lang.CharSequence text2, LineOffsets lineOffsets1, LineOffsets lineOffsets2, java.util.BitSet ignored1, java.util.BitSet ignored2, InnerFragmentsPolicy fragmentsPolicy, ProgressIndicator indicator)
java.util.List<LineFragment>	compareLinesWithIgnoredRanges(Range range, java.lang.CharSequence text1, java.lang.CharSequence text2, LineOffsets lineOffsets1, LineOffsets lineOffsets2, java.util.BitSet ignored1, java.util.BitSet ignored2, InnerFragmentsPolicy fragmentsPolicy, ProgressIndicator indicator) Compare two texts by-line and then compare changed fragments by-word
java.util.List<DiffFragment>	compareWords(java.lang.CharSequence text1, java.lang.CharSequence text2, ComparisonPolicy policy, ProgressIndicator indicator) Compare two texts by-word
static java.util.List<DiffFragment>	convertIntoDiffFragments(DiffIterable changes)
static java.util.List<LineFragment>	convertIntoLineFragments(Range range, LineOffsets lineOffsets1, LineOffsets lineOffsets2, DiffIterable changes)
static java.util.List<MergeLineFragment>	convertIntoMergeLineFragments(java.util.List<? extends MergeRange> conflicts)
static java.util.List<MergeWordFragment>	convertIntoMergeWordFragments(java.util.List<? extends MergeRange> conflicts)
static ComparisonManagerImpl	getInstanceImpl()
boolean	isEquals(java.lang.CharSequence text1, java.lang.CharSequence text2, ComparisonPolicy policy) Check if two texts are equal using ComparisonPolicy
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.
java.util.List<LineFragment>	processBlocks(java.util.List<LineFragment> oldFragments, java.lang.CharSequence text1, java.lang.CharSequence text2, ComparisonPolicy policy, boolean squash, boolean trim)
java.util.List<LineFragment>	squash(java.util.List<LineFragment> oldFragments) compareLinesInner() comparison can produce adjustment line chunks.

Methods inherited from class com.intellij.diff.comparison.ComparisonManager

getInstance

Methods inherited from class java.lang.Object

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

Constructor Detail

ComparisonManagerImpl

public ComparisonManagerImpl()

Method Detail

getInstanceImpl

public static ComparisonManagerImpl getInstanceImpl()

compareLines

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

Description copied from class: ComparisonManager

Compare two texts by-line

Specified by:

compareLines in class ComparisonManager

Throws:

DiffTooBigException

compareLines

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

Throws:

DiffTooBigException

compareLines

public java.util.List<LineFragment> compareLines(Range range,
                                                 java.lang.CharSequence text1,
                                                 java.lang.CharSequence text2,
                                                 LineOffsets lineOffsets1,
                                                 LineOffsets lineOffsets2,
                                                 ComparisonPolicy policy,
                                                 ProgressIndicator indicator)
                                          throws DiffTooBigException

Throws:

DiffTooBigException

compareLines

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

Description copied from class: ComparisonManager

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

Specified by:

compareLines in class ComparisonManager

Throws:

DiffTooBigException

mergeLines

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

Description copied from class: ComparisonManager

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

Specified by:

mergeLines in class ComparisonManager

Throws:

DiffTooBigException

compareLinesInner

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

Description copied from class: ComparisonManager

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

Specified by:

compareLinesInner in class ComparisonManager

Throws:

DiffTooBigException

compareLinesInner

public java.util.List<LineFragment> compareLinesInner(java.lang.CharSequence text1,
                                                      java.lang.CharSequence text2,
                                                      LineOffsets lineOffsets1,
                                                      LineOffsets lineOffsets2,
                                                      ComparisonPolicy policy,
                                                      InnerFragmentsPolicy fragmentsPolicy,
                                                      ProgressIndicator indicator)
                                               throws DiffTooBigException

Throws:

DiffTooBigException

compareLinesInner

public java.util.List<LineFragment> compareLinesInner(Range range,
                                                      java.lang.CharSequence text1,
                                                      java.lang.CharSequence text2,
                                                      LineOffsets lineOffsets1,
                                                      LineOffsets lineOffsets2,
                                                      ComparisonPolicy policy,
                                                      boolean innerFragments,
                                                      ProgressIndicator indicator)
                                               throws DiffTooBigException

Throws:

DiffTooBigException

compareLinesInner

public java.util.List<LineFragment> compareLinesInner(Range range,
                                                      java.lang.CharSequence text1,
                                                      java.lang.CharSequence text2,
                                                      LineOffsets lineOffsets1,
                                                      LineOffsets lineOffsets2,
                                                      ComparisonPolicy policy,
                                                      InnerFragmentsPolicy fragmentsPolicy,
                                                      ProgressIndicator indicator)
                                               throws DiffTooBigException

Throws:

DiffTooBigException

compareLinesInner

@Deprecated
public 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.

Specified by:

compareLinesInner in class ComparisonManager

Throws:

DiffTooBigException

compareWords

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

Description copied from class: ComparisonManager

Compare two texts by-word

Specified by:

compareWords in class ComparisonManager

Throws:

DiffTooBigException

compareChars

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

Description copied from class: ComparisonManager

Compare two texts by-char

Specified by:

compareChars in class ComparisonManager

Throws:

DiffTooBigException

isEquals

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

Description copied from class: ComparisonManager

Check if two texts are equal using ComparisonPolicy

Specified by:

isEquals in class ComparisonManager

convertIntoDiffFragments

public static java.util.List<DiffFragment> convertIntoDiffFragments(DiffIterable changes)

convertIntoLineFragments

public static java.util.List<LineFragment> convertIntoLineFragments(Range range,
                                                                    LineOffsets lineOffsets1,
                                                                    LineOffsets lineOffsets2,
                                                                    DiffIterable changes)

convertIntoMergeLineFragments

public static java.util.List<MergeLineFragment> convertIntoMergeLineFragments(java.util.List<? extends MergeRange> conflicts)

convertIntoMergeWordFragments

public static java.util.List<MergeWordFragment> convertIntoMergeWordFragments(java.util.List<? extends MergeRange> conflicts)

squash

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

Description copied from class: ComparisonManager

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)

Specified by:

squash in class ComparisonManager

processBlocks

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

Specified by:

processBlocks in class ComparisonManager

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

See Also:

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

compareLinesWithIgnoredRanges

public java.util.List<LineFragment> compareLinesWithIgnoredRanges(java.lang.CharSequence text1,
                                                                  java.lang.CharSequence text2,
                                                                  LineOffsets lineOffsets1,
                                                                  LineOffsets lineOffsets2,
                                                                  java.util.BitSet ignored1,
                                                                  java.util.BitSet ignored2,
                                                                  InnerFragmentsPolicy fragmentsPolicy,
                                                                  ProgressIndicator indicator)
                                                           throws DiffTooBigException

Throws:

DiffTooBigException

compareLinesWithIgnoredRanges

public java.util.List<LineFragment> compareLinesWithIgnoredRanges(Range range,
                                                                  java.lang.CharSequence text1,
                                                                  java.lang.CharSequence text2,
                                                                  LineOffsets lineOffsets1,
                                                                  LineOffsets lineOffsets2,
                                                                  java.util.BitSet ignored1,
                                                                  java.util.BitSet ignored2,
                                                                  InnerFragmentsPolicy fragmentsPolicy,
                                                                  ProgressIndicator indicator)
                                                           throws DiffTooBigException

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

Throws:

DiffTooBigException

collectIgnoredRanges

public static java.util.BitSet collectIgnoredRanges(java.util.List<? extends TextRange> ignoredRanges)