com.atlassian.confluence.diff

Class LineLevelDiffer

java.lang.Object

com.atlassian.confluence.diff.LineLevelDiffer

public class LineLevelDiffer
extends java.lang.Object

Wraps an Apache Diff with Atlassian goodness, making it closer to how a human expects the difference to appear.

Constructor Summary

Constructors

Constructor and Description
LineLevelDiffer()

Method Summary

Methods

Modifier and Type	Method and Description
static java.util.List<ChangeChunk>	diff(java.lang.String[] originalContent, java.lang.String[] revisedContent, int linesOfContext)
static java.util.List<ChangeChunk>	diff(java.lang.String[] originalContent, java.lang.String[] revisedContent, int linesContext, boolean ignoreWhiteSpace) Diff lines of text, showing all context.
static java.util.List<ChangeChunk>	diff(java.lang.String origContent, java.lang.String revdContent)
static java.util.List<ChangeChunk>	diff(java.lang.String origContent, java.lang.String revdContent, boolean ignoreWhiteSpace)
static java.util.List<ChangeChunk>	diff(java.lang.String origContent, java.lang.String revdContent, int linesContext, boolean ignoreWhiteSpace)
static java.util.List<ChangeChunk>	diffLines(java.lang.String[] origLines, java.lang.String[] revdLines, int linesOfContext)

Methods inherited from class java.lang.Object

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

Constructor Detail

LineLevelDiffer

public LineLevelDiffer()

Method Detail

diff

public static java.util.List<ChangeChunk> diff(java.lang.String[] originalContent,
                               java.lang.String[] revisedContent,
                               int linesContext,
                               boolean ignoreWhiteSpace)
                                        throws org.apache.commons.jrcs.diff.DifferentiationFailedException

Diff lines of text, showing all context.

Parameters:

ignoreWhiteSpace - Do not show added/removed spaces and newlines as changes.

Throws:

org.apache.commons.jrcs.diff.DifferentiationFailedException

diffLines

public static java.util.List<ChangeChunk> diffLines(java.lang.String[] origLines,
                                    java.lang.String[] revdLines,
                                    int linesOfContext)
                                             throws org.apache.commons.jrcs.diff.DifferentiationFailedException

Throws:

org.apache.commons.jrcs.diff.DifferentiationFailedException

diff

public static java.util.List<ChangeChunk> diff(java.lang.String origContent,
                               java.lang.String revdContent)
                                        throws org.apache.commons.jrcs.diff.DifferentiationFailedException

Throws:

org.apache.commons.jrcs.diff.DifferentiationFailedException

diff

public static java.util.List<ChangeChunk> diff(java.lang.String[] originalContent,
                               java.lang.String[] revisedContent,
                               int linesOfContext)
                                        throws org.apache.commons.jrcs.diff.DifferentiationFailedException

Throws:

org.apache.commons.jrcs.diff.DifferentiationFailedException

diff

public static java.util.List<ChangeChunk> diff(java.lang.String origContent,
                               java.lang.String revdContent,
                               boolean ignoreWhiteSpace)
                                        throws org.apache.commons.jrcs.diff.DifferentiationFailedException

Throws:

org.apache.commons.jrcs.diff.DifferentiationFailedException

diff

public static java.util.List<ChangeChunk> diff(java.lang.String origContent,
                               java.lang.String revdContent,
                               int linesContext,
                               boolean ignoreWhiteSpace)
                                        throws org.apache.commons.jrcs.diff.DifferentiationFailedException

Throws:

org.apache.commons.jrcs.diff.DifferentiationFailedException