com.atlassian.confluence.util.diffs
Class PageLayoutAwareMerger

java.lang.Object
  extended by com.atlassian.confluence.util.diffs.PageLayoutAwareMerger
All Implemented Interfaces:
Merger

public class PageLayoutAwareMerger
extends java.lang.Object
implements Merger


Constructor Summary
PageLayoutAwareMerger(Merger merger, XmlEventReaderFactory xmlEventReaderFactory, javax.xml.stream.XMLOutputFactory xmlOutputFactory)
           
 
Method Summary
 MergeResult mergeContent(java.lang.String base, java.lang.String left, java.lang.String right)
          Merge the content provided.
 
Methods inherited from class java.lang.Object
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
 

Constructor Detail

PageLayoutAwareMerger

public PageLayoutAwareMerger(Merger merger,
                             XmlEventReaderFactory xmlEventReaderFactory,
                             javax.xml.stream.XMLOutputFactory xmlOutputFactory)
Method Detail

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.


Copyright © 2003-2014 Atlassian. All Rights Reserved.