|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |
java.lang.Object com.atlassian.confluence.util.diffs.PageLayoutAwareMerger
public class PageLayoutAwareMerger
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 |
---|
public PageLayoutAwareMerger(Merger merger, XmlEventReaderFactory xmlEventReaderFactory, javax.xml.stream.XMLOutputFactory xmlOutputFactory)
Method Detail |
---|
public MergeResult mergeContent(java.lang.String base, java.lang.String left, java.lang.String right)
Merger
mergeContent
in interface Merger
base
- common base for left and right strings.left
- branch 1 to merge inright
- branch 2 to merge in.
|
||||||||||
PREV CLASS NEXT CLASS | FRAMES NO FRAMES | |||||||||
SUMMARY: NESTED | FIELD | CONSTR | METHOD | DETAIL: FIELD | CONSTR | METHOD |