org.xwiki.extension.xar.question

Class ConflictQuestion

java.lang.Object

org.xwiki.extension.xar.question.ConflictQuestion

public class ConflictQuestion
extends Object

Since:

4.0M2

Version:

$Id: 1db7f40545efed0aa2f92bbcc701acc3df52da94 $

Nested Class Summary

Nested Classes

Modifier and Type	Class and Description
static class	ConflictQuestion.ConflictType The type of conflict.
static class	ConflictQuestion.GlobalAction

Field Summary

Fields

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 Summary

Constructors

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)

Method Summary

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)

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Field Detail

REQUEST_CONFLICT_DEFAULTANSWER_MERGE_SUCCESS

public static final String REQUEST_CONFLICT_DEFAULTANSWER_MERGE_SUCCESS

Since:

9.2RC1

See Also:

ConflictQuestion.ConflictType.MERGE_SUCCESS

REQUEST_CONFLICT_DEFAULTANSWER_MERGE_FAILURE

public static final String REQUEST_CONFLICT_DEFAULTANSWER_MERGE_FAILURE

Since:

9.2RC1

See Also:

ConflictQuestion.ConflictType.MERGE_FAILURE

REQUEST_CONFLICT_DEFAULTANSWER_CURRENT_EXIST

public static final String REQUEST_CONFLICT_DEFAULTANSWER_CURRENT_EXIST

Since:

9.2RC1

See Also:

ConflictQuestion.ConflictType.CURRENT_EXIST

REQUEST_CONFLICT_DEFAULTANSWER_CURRENT_DELETED

public static final String REQUEST_CONFLICT_DEFAULTANSWER_CURRENT_DELETED

Since:

9.2RC1

See Also:

ConflictQuestion.ConflictType.CURRENT_DELETED

Constructor Detail

ConflictQuestion

@Deprecated
public ConflictQuestion(XWikiDocument currentDocument,
                                    XWikiDocument previousDocument,
                                    XWikiDocument nextDocument,
                                    XWikiDocument mergedDocument)

Deprecated. since 9.2RC1, use

ConflictQuestion

public ConflictQuestion(XWikiDocument currentDocument,
                        XWikiDocument previousDocument,
                        XWikiDocument nextDocument,
                        XWikiDocument mergedDocument,
                        ConflictQuestion.ConflictType type)

Since:

9.2RC1

ConflictQuestion

public ConflictQuestion(XWikiDocument currentDocument,
                        XWikiDocument previousDocument,
                        XWikiDocument nextDocument,
                        XWikiDocument mergedDocument,
                        ConflictQuestion.ConflictType type,
                        List<org.xwiki.diff.Conflict<?>> documentConflicts)

Since:

11.8RC1

Method Detail

toKey

public static String toKey(ConflictQuestion.ConflictType type)

getType

public ConflictQuestion.ConflictType getType()

Returns:

the type of conflict

Since:

9.2RC1

getCurrentDocument

public XWikiDocument getCurrentDocument()

getPreviousDocument

public XWikiDocument getPreviousDocument()

getNextDocument

public XWikiDocument getNextDocument()

getMergedDocument

public XWikiDocument getMergedDocument()

getDocumentConflicts

public List<org.xwiki.diff.Conflict<?>> getDocumentConflicts()

Returns:

the conflicts occured during the merge of documents.

Since:

11.8RC1

getGlobalAction

public ConflictQuestion.GlobalAction getGlobalAction()

setGlobalAction

public void setGlobalAction(ConflictQuestion.GlobalAction globalAction)

getCustomDocument

public XWikiDocument getCustomDocument()

Since:

4.1

setCustomDocument

public void setCustomDocument(XWikiDocument customDocument)

Since:

4.1

isAlways

public boolean isAlways()

Returns:

if true apply the same answer to following conflict. Does nothing if the answer is ConflictQuestion.GlobalAction.CUSTOM.

Since:

5.1RC1

setAlways

public void setAlways(boolean always)

Parameters:

always - if true apply the same answer to following conflict. Does nothing if the answer is ConflictQuestion.GlobalAction.CUSTOM.

Since:

5.1RC1

setConflictDecision

public void setConflictDecision(String conflictReference,
                                String decisionType,
                                String customValue)

getDecisions

public List<org.xwiki.diff.ConflictDecision> getDecisions()