R
- the type of the merge resultC
- the type of the conflicts@Unstable public class MergeManagerResult<R,C> extends Object
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.
Constructor and Description |
---|
MergeManagerResult()
Default constructor.
|
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) |
public boolean isModified()
true
if the merge result version is different than the current one.public void setModified(boolean modified)
modified
- set true
if the merge result is different than the current version.public void addConflicts(List<org.xwiki.diff.Conflict<C>> conflicts)
MergeResult
inside this result.conflicts
- the conflicts to addpublic List<org.xwiki.diff.Conflict<C>> getConflicts()
public void setMergeResult(R result)
result
- the result of the merge operation.public R getMergeResult()
public org.xwiki.logging.LogQueue getLog()
public boolean hasConflicts()
true
if at least one conflict occured during the merge operation.Copyright © 2004–2021 XWiki. All rights reserved.