Class 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 a Conflict representation for the unified diff. It represents only a part of a conflict for a UnifiedDiffElement.
    Since:
    11.7RC1
    Version:
    $Id: f02e125f87b7f32233c6c2f4a49eb35b4c1ab574 $
    • Constructor Detail

      • UnifiedDiffConflictElement

        public UnifiedDiffConflictElement​(Conflict<E> conflict)
        Creates a conflict element based on a given conflict and the index of the UnifiedDiffElement.
        Parameters:
        conflict - the original conflict.
    • Method Detail

      • getPreviousElement

        public List<E> getPreviousElement()
        Returns:
        the previous version of the element.
      • getNextElement

        public List<E> getNextElement()
        Returns:
        the next version of the element.
      • getCurrentElement

        public List<E> getCurrentElement()
        Returns:
        the current version of the element.
      • getReference

        public String getReference()
        Returns:
        the conflict reference.