Package org.eclipse.jgit.merge
Class MergeChunk
java.lang.Object
org.eclipse.jgit.merge.MergeChunk
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 ClassesModifier and TypeClassDescriptionstatic enum
A state telling whether a MergeChunk belongs to a conflict or not. -
Field Summary
FieldsModifier and TypeFieldDescriptionprivate final int
private final MergeChunk.ConflictState
private final int
private final int
-
Constructor Summary
ConstructorsModifierConstructorDescriptionprotected
MergeChunk
(int sequenceIndex, int begin, int end, MergeChunk.ConflictState conflictState) Creates a new empty MergeChunk -
Method Summary
Modifier and TypeMethodDescriptionint
getBegin()
Get the first element from the specified sequence which should be included in the merge result.Get the state of this chunk.int
getEnd()
Get the end of the range of this chunk.int
Get the index of the sequence to which this sequence chunks belongs to.
-
Field Details
-
sequenceIndex
private final int sequenceIndex -
begin
private final int begin -
end
private final int end -
conflictState
-
-
Constructor Details
-
MergeChunk
Creates a new empty MergeChunk- Parameters:
sequenceIndex
- determines to which sequence this chunks belongs to. Same as inMergeResult.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. SeeMergeChunk.ConflictState
-
-
Method Details
-
getSequenceIndex
public int getSequenceIndex()Get the index of the sequence to which this sequence chunks belongs to.- Returns:
- the index of the sequence to which this sequence chunks belongs
to. Same as in
MergeResult.add(int, int, int, org.eclipse.jgit.merge.MergeChunk.ConflictState)
-
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.
-
getConflictState
Get the state of this chunk.- Returns:
- the state of this chunk. See
MergeChunk.ConflictState
-