G M O R 
All Classes All Packages

G

getAllConflicts() - Method in class org.xwiki.store.merge.MergeDocumentResultScript
 
getContentConflicts() - Method in class org.xwiki.store.merge.MergeDocumentResultScript
 
getCurrentDocument() - Method in class org.xwiki.store.merge.MergeDocumentResultScript
 
getDecision(Conflict<String>, ConflictDecision.DecisionType, String) - Method in class org.xwiki.store.merge.MergeScriptService
Create a ConflictDecision based on an existing conflict and a choice made.
getMergedDocument() - Method in class org.xwiki.store.merge.MergeDocumentResultScript
 
getNextDocument() - Method in class org.xwiki.store.merge.MergeDocumentResultScript
 
getPreviousDocument() - Method in class org.xwiki.store.merge.MergeDocumentResultScript
 

M

mergeDocument(Document, Document, Document) - Method in class org.xwiki.store.merge.MergeScriptService
Perform a merge 3 points between the currentDocument and the newDocument, the previousDocument being the common ancestor of both documents.
MergeDocumentResultScript - Class in org.xwiki.store.merge
Represents the result of a 3-way merge on documents performed in the MergeScriptService.
MergeDocumentResultScript(MergeDocumentResult, XWikiContext) - Constructor for class org.xwiki.store.merge.MergeDocumentResultScript
Default constructor.
MergeScriptService - Class in org.xwiki.store.merge
Script service allowing to perform merge operations on documents.
MergeScriptService() - Constructor for class org.xwiki.store.merge.MergeScriptService
 

O

org.xwiki.store.merge - package org.xwiki.store.merge
 

R

recordDecisions(List<ConflictDecision>) - Method in class org.xwiki.store.merge.MergeScriptService
Record all the decisions taken in the MergeConflictDecisionsManager.
G M O R 
All Classes All Packages