Package 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	Description
DaisyHtmlDiffer(Transformer transformer, List<DiffPostProcessor> postProcessors, com.atlassian.cache.CacheFactory cacheFactory, LocaleManager localeManager)	Deprecated, for removal: This API element is subject to removal in a future version. since 8.6

Method Summary

Modifier and Type	Method	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)	Deprecated, for removal: This API element is subject to removal in a future version. since 8.6
String	diff(String leftHtml, String rightHtml, org.eclipse.core.runtime.IProgressMonitor progressMonitor, boolean useOldAlgorithm)	Deprecated, for removal: This API element is subject to removal in a future version. since 8.6

Methods inherited from class java.lang.Object

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

Constructor Detail

DaisyHtmlDiffer

@Deprecated(forRemoval=true)
public DaisyHtmlDiffer(Transformer transformer,
                       List<DiffPostProcessor> postProcessors,
                       com.atlassian.cache.CacheFactory cacheFactory,
                       LocaleManager localeManager)

Deprecated, for removal: This API element is subject to removal in a future version.

since 8.6

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

@Deprecated(forRemoval=true)
public String diff(String leftHtml,
                   String rightHtml,
                   org.eclipse.core.runtime.IProgressMonitor progressMonitor)

Deprecated, for removal: This API element is subject to removal in a future version.

since 8.6

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

@Deprecated(forRemoval=true)
public String diff(String leftHtml,
                   String rightHtml,
                   org.eclipse.core.runtime.IProgressMonitor progressMonitor,
                   boolean useOldAlgorithm)

Deprecated, for removal: This API element is subject to removal in a future version.

since 8.6

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