com.atlassian.confluence.plugins.merge
Class TDMMerger

java.lang.Object
  com.atlassian.confluence.plugins.merge.TDMMerger

All Implemented Interfaces:

Merger, org.springframework.beans.factory.DisposableBean

public class TDMMerger
extends java.lang.Object
implements Merger, org.springframework.beans.factory.DisposableBean

Constructor Summary

TDMMerger(XmlEventReaderFactory xmlEventReaderFactory, XmlOutputFactoryProvider xmlOutputFactoryProvider, com.atlassian.sal.api.executor.ThreadLocalDelegateExecutorFactory threadLocalDelegateExecutorFactory)

Method Summary

void	destroy()
MergeResult	mergeContent(java.lang.String base, java.lang.String left, java.lang.String right) Merge the content provided.
MergeResult	mergeContent(java.lang.String base, java.lang.String left, java.lang.String right, long timeout, java.util.concurrent.TimeUnit unit)

Methods inherited from class java.lang.Object

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

Constructor Detail

TDMMerger

public TDMMerger(XmlEventReaderFactory xmlEventReaderFactory,
                 XmlOutputFactoryProvider xmlOutputFactoryProvider,
                 com.atlassian.sal.api.executor.ThreadLocalDelegateExecutorFactory threadLocalDelegateExecutorFactory)

Method Detail

mergeContent

public MergeResult mergeContent(java.lang.String base,
                                java.lang.String left,
                                java.lang.String right,
                                long timeout,
                                @Nonnull
                                java.util.concurrent.TimeUnit unit)

mergeContent

public MergeResult mergeContent(java.lang.String base,
                                java.lang.String left,
                                java.lang.String right)

Description copied from interface: Merger

Merge the content provided.

Specified by:

mergeContent in interface Merger

Parameters:

base - common base for left and right strings.

left - branch 1 to merge in

right - branch 2 to merge in.

Returns:

the result of the merge. Note that implementations should never return null. If the merge failed the returned mergeresult should contain this information.

destroy

public void destroy()

Specified by:

destroy in interface org.springframework.beans.factory.DisposableBean