Package org.xwiki.diff.display
Class UnifiedDiffConflictElement<E>
- java.lang.Object
-
- org.xwiki.diff.display.UnifiedDiffConflictElement<E>
-
- Type Parameters:
E
- the type of elements that are compared to produce the first-level diff
public class UnifiedDiffConflictElement<E> extends Object
This is aConflict
representation for the unified diff. It represents only a part of a conflict for aUnifiedDiffElement
.- Since:
- 11.7RC1
- Version:
- $Id: f02e125f87b7f32233c6c2f4a49eb35b4c1ab574 $
-
-
Constructor Summary
Constructors Constructor Description UnifiedDiffConflictElement(Conflict<E> conflict)
Creates a conflict element based on a given conflict and the index of theUnifiedDiffElement
.
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description List<E>
getCurrentElement()
List<E>
getNextElement()
List<E>
getPreviousElement()
String
getReference()
-
-
-
Constructor Detail
-
UnifiedDiffConflictElement
public UnifiedDiffConflictElement(Conflict<E> conflict)
Creates a conflict element based on a given conflict and the index of theUnifiedDiffElement
.- Parameters:
conflict
- the original conflict.
-
-