Package org.xwiki.diff
Interface ConflictDecision<E>
-
- Type Parameters:
E
- the type of element used in the merge operation.
public interface ConflictDecision<E>
Represent a decision taken to solve a givenConflict
.- Since:
- 11.7RC1
- Version:
- $Id: 7276f0bb6993959a533eac7ed869561d58652171 $
-
-
Nested Class Summary
Nested Classes Modifier and Type Interface Description static class
ConflictDecision.DecisionType
The decision made for this conflict.
-
Method Summary
All Methods Instance Methods Abstract Methods Modifier and Type Method Description Chunk<E>
getChunk()
Conflict<E>
getConflict()
ConflictDecision.DecisionType
getType()
void
setCustom(List<E> chunkElement)
Allow to specify a custom chunk.void
setType(ConflictDecision.DecisionType type)
-
-
-
Method Detail
-
setType
void setType(ConflictDecision.DecisionType type)
- Parameters:
type
- the decision made for this conflict.
-
setCustom
void setCustom(List<E> chunkElement)
Allow to specify a custom chunk. This method should automatically set the type toConflictDecision.DecisionType.CUSTOM
.- Parameters:
chunkElement
- the custom chunk to set for this decision.
-
getType
ConflictDecision.DecisionType getType()
- Returns:
- the decision made for this conflict.
-
getChunk
Chunk<E> getChunk()
- Returns:
- the appropriate chunk given the decision type. See
ConflictDecision.DecisionType
for more information.
-
-