org.xwiki.store.merge

Class MergeManagerResult<R,C>

java.lang.Object

org.xwiki.store.merge.MergeManagerResult<R,C>

Type Parameters:

R - the type of the merge result

C - the type of the conflicts

Direct Known Subclasses:

MergeDocumentResult

@Unstable
public class MergeManagerResult<R,C>
extends Object

This represents the result of a merge operation: it contains both the result of the merge, the possible conflicts that happened during the merge, and the logs.

The merge result and the conflict might have distinct types: for example, a merge performed on String by splitting it by characters, will expect a String result type, but a Character conflict type.

Since:

11.8RC1

Version:

$Id: 50ac4053dcce45b6233754900c0a1297e807a90b $

Constructor Summary

Constructors

Constructor and Description
MergeManagerResult() Default constructor.

Method Summary

Modifier and Type	Method and Description
void	addConflicts(List<org.xwiki.diff.Conflict<C>> conflicts) Add some conflicts returned by a MergeResult inside this result.
List<org.xwiki.diff.Conflict<C>>	getConflicts()
org.xwiki.logging.LogQueue	getLog()
R	getMergeResult()
boolean	hasConflicts()
boolean	isModified()
void	setMergeResult(R result) Set the result obtained during the merge.
void	setModified(boolean modified)

Methods inherited from class java.lang.Object

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

Constructor Detail

MergeManagerResult

public MergeManagerResult()

Default constructor.

Method Detail

isModified

public boolean isModified()

Returns:

true if the merge result version is different than the current one.

setModified

public void setModified(boolean modified)

Parameters:

modified - set true if the merge result is different than the current version.

addConflicts

public void addConflicts(List<org.xwiki.diff.Conflict<C>> conflicts)

Add some conflicts returned by a MergeResult inside this result.

Parameters:

conflicts - the conflicts to add

getConflicts

public List<org.xwiki.diff.Conflict<C>> getConflicts()

Returns:

all the conflicts occured during this merge

setMergeResult

public void setMergeResult(R result)

Set the result obtained during the merge.

Parameters:

result - the result of the merge operation.

getMergeResult

public R getMergeResult()

Returns:

the resulted object of the merge.

getLog

public org.xwiki.logging.LogQueue getLog()

Returns:

the log associated to the merge

hasConflicts

public boolean hasConflicts()

Returns:

true if at least one conflict occured during the merge operation.