@Unstable public class MergeDocumentResult extends MergeManagerResult<DocumentModelBridge,Object>
putMergeResult(DocumentPart, MergeManagerResult)
for more information.Modifier and Type | Class and Description |
---|---|
static class |
MergeDocumentResult.DocumentPart
Represents the different parts of a document that are merged.
|
Constructor and Description |
---|
MergeDocumentResult(DocumentModelBridge currentDocument,
DocumentModelBridge previousDocument,
DocumentModelBridge nextDocument)
Default constructor.
|
Modifier and Type | Method and Description |
---|---|
List<org.xwiki.diff.Conflict<?>> |
getConflicts(MergeDocumentResult.DocumentPart documentPart)
Retrieve the conclicts that occurred during merging a specific part of the document.
|
DocumentModelBridge |
getCurrentDocument() |
MergeManagerResult |
getMergeResult(MergeDocumentResult.DocumentPart documentPart) |
DocumentModelBridge |
getNextDocument() |
DocumentModelBridge |
getPreviousDocument() |
void |
putMergeResult(MergeDocumentResult.DocumentPart documentPart,
MergeManagerResult mergeManagerResult)
Stores the result of merging a part of the document.
|
addConflicts, getConflicts, getLog, getMergeResult, hasConflicts, isModified, setMergeResult, setModified
@Unstable public MergeDocumentResult(DocumentModelBridge currentDocument, DocumentModelBridge previousDocument, DocumentModelBridge nextDocument)
currentDocument
- the current document used for the merge.previousDocument
- the previous document used for the merge.nextDocument
- the next document used for the merge.public DocumentModelBridge getCurrentDocument()
public DocumentModelBridge getPreviousDocument()
public DocumentModelBridge getNextDocument()
public void putMergeResult(MergeDocumentResult.DocumentPart documentPart, MergeManagerResult mergeManagerResult)
MergeManagerResult
and stored in the
current object.documentPart
- the part of the document that has been merged.mergeManagerResult
- the result of the given merge operation.public MergeManagerResult getMergeResult(MergeDocumentResult.DocumentPart documentPart)
documentPart
- a document part that has been mergedpublic List<org.xwiki.diff.Conflict<?>> getConflicts(MergeDocumentResult.DocumentPart documentPart)
documentPart
- the part of the document that has been merged.Copyright © 2004–2021 XWiki. All rights reserved.