com.atlassian.confluence.diff

Class DaisyHtmlDiffer

java.lang.Object

com.atlassian.confluence.diff.DaisyHtmlDiffer

All Implemented Interfaces:

Differ

public class DaisyHtmlDiffer
extends Object
implements Differ

Daisy HTML diff implementation.

Constructor Summary

Constructors

Constructor and Description
DaisyHtmlDiffer(Transformer transformer, List<DiffPostProcessor> postProcessors, com.atlassian.vcache.VCacheFactory cacheFactory, LocaleManager localeManager)

Method Summary

Modifier and Type	Method and Description
String	diff(ContentEntityObject leftContent, ContentEntityObject rightContent) Computes a diff between the specified left and right input.
String	diff(String leftHtml, String rightHtml, org.eclipse.core.runtime.IProgressMonitor progressMonitor) Diff two pieces of XHTML content.
String	diff(String leftHtml, String rightHtml, org.eclipse.core.runtime.IProgressMonitor progressMonitor, boolean useOldAlgorithm) Diff two pieces of XHTML content.

Methods inherited from class java.lang.Object

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

Constructor Detail

DaisyHtmlDiffer

public DaisyHtmlDiffer(Transformer transformer,
                       List<DiffPostProcessor> postProcessors,
                       com.atlassian.vcache.VCacheFactory cacheFactory,
                       LocaleManager localeManager)

Method Detail

diff

public String diff(ContentEntityObject leftContent,
                   ContentEntityObject rightContent)

Description copied from interface: Differ

Computes a diff between the specified left and right input.
The html output will contain span tags with class="diff-html-added|diff-html-removed|diff-html-changed" to indicate differences.

Specified by:

diff in interface Differ

Parameters:

leftContent - left input

rightContent - right input

Returns:

a diff

diff

public String diff(String leftHtml,
                   String rightHtml,
                   org.eclipse.core.runtime.IProgressMonitor progressMonitor)

Diff two pieces of XHTML content.

Parameters:

leftHtml - the left HTML content

rightHtml - the right HTML content

progressMonitor - progress monitor to monitor timeout, etc

Returns:

String output of the diff result

diff

public String diff(String leftHtml,
                   String rightHtml,
                   org.eclipse.core.runtime.IProgressMonitor progressMonitor,
                   boolean useOldAlgorithm)

Diff two pieces of XHTML content.

Parameters:

leftHtml - the left HTML content

rightHtml - the right HTML content

progressMonitor - progress monitor to monitor timeout, etc

useOldAlgorithm - if true, diff will use the old non-greedy algorithm, which can result in OOM issues for large diffs

Returns:

String output of the diff result