public class ConflictQuestion extends Object
Modifier and Type | Class and Description |
---|---|
static class |
ConflictQuestion.ConflictType
The type of conflict.
|
static class |
ConflictQuestion.GlobalAction |
Modifier and Type | Field and Description |
---|---|
static String |
REQUEST_CONFLICT_DEFAULTANSWER_CURRENT_DELETED |
static String |
REQUEST_CONFLICT_DEFAULTANSWER_CURRENT_EXIST |
static String |
REQUEST_CONFLICT_DEFAULTANSWER_MERGE_FAILURE |
static String |
REQUEST_CONFLICT_DEFAULTANSWER_MERGE_SUCCESS |
Constructor and Description |
---|
ConflictQuestion(XWikiDocument currentDocument,
XWikiDocument previousDocument,
XWikiDocument nextDocument,
XWikiDocument mergedDocument)
Deprecated.
since 9.2RC1, use
|
ConflictQuestion(XWikiDocument currentDocument,
XWikiDocument previousDocument,
XWikiDocument nextDocument,
XWikiDocument mergedDocument,
ConflictQuestion.ConflictType type) |
ConflictQuestion(XWikiDocument currentDocument,
XWikiDocument previousDocument,
XWikiDocument nextDocument,
XWikiDocument mergedDocument,
ConflictQuestion.ConflictType type,
List<org.xwiki.diff.Conflict<?>> documentConflicts) |
Modifier and Type | Method and Description |
---|---|
XWikiDocument |
getCurrentDocument() |
XWikiDocument |
getCustomDocument() |
List<org.xwiki.diff.ConflictDecision> |
getDecisions() |
List<org.xwiki.diff.Conflict<?>> |
getDocumentConflicts() |
ConflictQuestion.GlobalAction |
getGlobalAction() |
XWikiDocument |
getMergedDocument() |
XWikiDocument |
getNextDocument() |
XWikiDocument |
getPreviousDocument() |
ConflictQuestion.ConflictType |
getType() |
boolean |
isAlways() |
void |
setAlways(boolean always) |
void |
setConflictDecision(String conflictReference,
String decisionType,
String customValue) |
void |
setCustomDocument(XWikiDocument customDocument) |
void |
setGlobalAction(ConflictQuestion.GlobalAction globalAction) |
static String |
toKey(ConflictQuestion.ConflictType type) |
public static final String REQUEST_CONFLICT_DEFAULTANSWER_MERGE_SUCCESS
ConflictQuestion.ConflictType.MERGE_SUCCESS
public static final String REQUEST_CONFLICT_DEFAULTANSWER_MERGE_FAILURE
ConflictQuestion.ConflictType.MERGE_FAILURE
public static final String REQUEST_CONFLICT_DEFAULTANSWER_CURRENT_EXIST
ConflictQuestion.ConflictType.CURRENT_EXIST
public static final String REQUEST_CONFLICT_DEFAULTANSWER_CURRENT_DELETED
ConflictQuestion.ConflictType.CURRENT_DELETED
@Deprecated public ConflictQuestion(XWikiDocument currentDocument, XWikiDocument previousDocument, XWikiDocument nextDocument, XWikiDocument mergedDocument)
public ConflictQuestion(XWikiDocument currentDocument, XWikiDocument previousDocument, XWikiDocument nextDocument, XWikiDocument mergedDocument, ConflictQuestion.ConflictType type)
public ConflictQuestion(XWikiDocument currentDocument, XWikiDocument previousDocument, XWikiDocument nextDocument, XWikiDocument mergedDocument, ConflictQuestion.ConflictType type, List<org.xwiki.diff.Conflict<?>> documentConflicts)
public static String toKey(ConflictQuestion.ConflictType type)
public ConflictQuestion.ConflictType getType()
public XWikiDocument getCurrentDocument()
public XWikiDocument getPreviousDocument()
public XWikiDocument getNextDocument()
public XWikiDocument getMergedDocument()
public List<org.xwiki.diff.Conflict<?>> getDocumentConflicts()
public ConflictQuestion.GlobalAction getGlobalAction()
public void setGlobalAction(ConflictQuestion.GlobalAction globalAction)
public XWikiDocument getCustomDocument()
public void setCustomDocument(XWikiDocument customDocument)
public boolean isAlways()
ConflictQuestion.GlobalAction.CUSTOM
.public void setAlways(boolean always)
always
- if true apply the same answer to following conflict. Does nothing if the answer is
ConflictQuestion.GlobalAction.CUSTOM
.public void setConflictDecision(String conflictReference, String decisionType, String customValue)
public List<org.xwiki.diff.ConflictDecision> getDecisions()
Copyright © 2004–2022 XWiki. All rights reserved.