Class MergeChunk


  • public class MergeChunk
    extends java.lang.Object
    One chunk from a merge result. Each chunk contains a range from a single sequence. In case of conflicts multiple chunks are reported for one conflict. The conflictState tells when conflicts start and end.
    • Nested Class Summary

      Nested Classes 
      Modifier and Type Class Description
      static class  MergeChunk.ConflictState
      A state telling whether a MergeChunk belongs to a conflict or not.
    • Constructor Summary

      Constructors 
      Modifier Constructor Description
      protected MergeChunk​(int sequenceIndex, int begin, int end, MergeChunk.ConflictState conflictState)
      Creates a new empty MergeChunk
    • Method Summary

      All Methods Instance Methods Concrete Methods 
      Modifier and Type Method Description
      int getBegin()
      Get the first element from the specified sequence which should be included in the merge result.
      MergeChunk.ConflictState getConflictState()
      Get the state of this chunk.
      int getEnd()
      Get the end of the range of this chunk.
      int getSequenceIndex()
      Get the index of the sequence to which this sequence chunks belongs to.
      • Methods inherited from class java.lang.Object

        clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
    • Field Detail

      • sequenceIndex

        private final int sequenceIndex
      • begin

        private final int begin
      • end

        private final int end
    • Constructor Detail

      • MergeChunk

        protected MergeChunk​(int sequenceIndex,
                             int begin,
                             int end,
                             MergeChunk.ConflictState conflictState)
        Creates a new empty MergeChunk
        Parameters:
        sequenceIndex - determines to which sequence this chunks belongs to. Same as in MergeResult.add(int, int, int, org.eclipse.jgit.merge.MergeChunk.ConflictState)
        begin - the first element from the specified sequence which should be included in the merge result. Indexes start with 0.
        end - specifies the end of the range to be added. The element this index points to is the first element which not added to the merge result. All elements between begin (including begin) and this element are added.
        conflictState - the state of this chunk. See MergeChunk.ConflictState
    • Method Detail

      • getBegin

        public int getBegin()
        Get the first element from the specified sequence which should be included in the merge result.
        Returns:
        the first element from the specified sequence which should be included in the merge result. Indexes start with 0.
      • getEnd

        public int getEnd()
        Get the end of the range of this chunk.
        Returns:
        the end of the range of this chunk. The element this index points to is the first element which not added to the merge result. All elements between begin (including begin) and this element are added.