Package org.xwiki.store.merge
Class MergeDocumentResultScript
- java.lang.Object
-
- org.xwiki.store.merge.MergeDocumentResultScript
-
public class MergeDocumentResultScript extends Object
Represents the result of a 3-way merge on documents performed in theMergeScriptService
.- Since:
- 11.8RC1
- Version:
- $Id: 3a720ca68bc604073788f01332f9185c7c0a658a $
-
-
Constructor Summary
Constructors Constructor Description MergeDocumentResultScript(MergeDocumentResult mergeDocumentResult, XWikiContext context)
Default constructor.
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description List<org.xwiki.diff.Conflict<Object>>
getAllConflicts()
List<org.xwiki.diff.Conflict<?>>
getContentConflicts()
Document
getCurrentDocument()
Document
getMergedDocument()
Document
getNextDocument()
Document
getPreviousDocument()
-
-
-
Constructor Detail
-
MergeDocumentResultScript
public MergeDocumentResultScript(MergeDocumentResult mergeDocumentResult, XWikiContext context)
Default constructor.- Parameters:
mergeDocumentResult
- the actual result obtained throughMergeManager.mergeDocument(DocumentModelBridge, DocumentModelBridge, DocumentModelBridge, MergeConfiguration)
.context
- the current context.
-
-
Method Detail
-
getPreviousDocument
public Document getPreviousDocument()
- Returns:
- the previous document used for the merge.
-
getCurrentDocument
public Document getCurrentDocument()
- Returns:
- the current document used for the merge.
-
getNextDocument
public Document getNextDocument()
- Returns:
- the new document used for the merge.
-
getMergedDocument
public Document getMergedDocument()
- Returns:
- the merged document obtained after the merge.
-
getContentConflicts
public List<org.xwiki.diff.Conflict<?>> getContentConflicts()
- Returns:
- the conflicts that occurred when merging the content of document.
-
-