Modifier and Type	Class and Description
public static enum	MergeChunk.ConflictState A state telling whether a MergeChunk belongs to a conflict or not.

Modifier and Type	Field and Description
private final int	begin
private final MergeChunk.ConflictState	conflictState
private final int	end
private final int	sequenceIndex

Constructor Summary

Access Constructor and Description

protected

Access	Constructor and Description
protected	MergeChunk(int determines to which sequence this chunks belongs to. Same as in `org.eclipse.jgit.merge.MergeResult#add` sequenceIndex, int the first element from the specified sequence which should be included in the merge result. Indexes start with 0. begin, int 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. end, MergeChunk.ConflictState the state of this chunk. See `org.eclipse.jgit.merge.MergeChunk.ConflictState` conflictState) Creates a new empty MergeChunk

determines to which sequence this chunks belongs to. Same as in org.eclipse.jgit.merge.MergeResult#add

sequenceIndex, int

the first element from the specified sequence which should be included in the merge result. Indexes start with 0.

begin, int

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.

end, MergeChunk.ConflictState

the state of this chunk. See org.eclipse.jgit.merge.MergeChunk.ConflictState

conflictState)

Creates a new empty MergeChunk

Method Summary

Modifier and Type	Method and Description
public int	Returns: the first element from the specified sequence which should be included in the merge result. Indexes start with 0. getBegin() Get the first element from the specified sequence which should be included in the merge result.
public MergeChunk.ConflictState	Returns: the state of this chunk. See `org.eclipse.jgit.merge.MergeChunk.ConflictState` getConflictState() Get the state of this chunk.
public int	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. getEnd() Get the end of the range of this chunk.
public int	Returns: the index of the sequence to which this sequence chunks belongs to. Same as in `org.eclipse.jgit.merge.MergeResult#add` getSequenceIndex() Get the index of the sequence to which this sequence chunks belongs to.

Inherited from java.lang.Object:: clone equals finalize getClass hashCode notify notifyAll toString wait wait wait

begin	back to summary
private final int begin

conflictState	back to summary
private final MergeChunk.ConflictState conflictState

end	back to summary
private final int end

sequenceIndex	back to summary
private final int sequenceIndex

Constructor Detail

MergeChunk back to summary

MergeChunk	back to summary
protected MergeChunk(int sequenceIndex, int begin, int end, MergeChunk.ConflictState conflictState) Creates a new empty MergeChunk Parameters sequenceIndex:int determines to which sequence this chunks belongs to. Same as in `org.eclipse.jgit.merge.MergeResult#add` begin:int the first element from the specified sequence which should be included in the merge result. Indexes start with 0. end:int 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:MergeChunk.ConflictState the state of this chunk. See `org.eclipse.jgit.merge.MergeChunk.ConflictState`

protected MergeChunk(int sequenceIndex, int begin, int end, MergeChunk.ConflictState conflictState)

Creates a new empty MergeChunk

Parameters

sequenceIndex:int: determines to which sequence this chunks belongs to. Same as in org.eclipse.jgit.merge.MergeResult#add
begin:int: the first element from the specified sequence which should be included in the merge result. Indexes start with 0.
end:int: 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:MergeChunk.ConflictState: the state of this chunk. See org.eclipse.jgit.merge.MergeChunk.ConflictState

Method Detail

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

getBegin

back to summary

public int getBegin()

Get the first element from the specified sequence which should be included in the merge result.

Returns:int: the first element from the specified sequence which should be included in the merge result. Indexes start with 0.

getConflictState back to summary

getConflictState	back to summary
public MergeChunk.ConflictState getConflictState() Get the state of this chunk. Returns:MergeChunk.ConflictState the state of this chunk. See `org.eclipse.jgit.merge.MergeChunk.ConflictState`

public MergeChunk.ConflictState getConflictState()

Get the state of this chunk.

Returns:MergeChunk.ConflictState: the state of this chunk. See org.eclipse.jgit.merge.MergeChunk.ConflictState

getEnd	back to summary
public int getEnd() Get the end of the range of this chunk. Returns:int 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.

getEnd

back to summary

public int getEnd()

Get the end of the range of this chunk.

Returns:int: 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.

getSequenceIndex back to summary

getSequenceIndex	back to summary
public int getSequenceIndex() Get the index of the sequence to which this sequence chunks belongs to. Returns:int the index of the sequence to which this sequence chunks belongs to. Same as in `org.eclipse.jgit.merge.MergeResult#add`

public int getSequenceIndex()

Get the index of the sequence to which this sequence chunks belongs to.

Returns:int: the index of the sequence to which this sequence chunks belongs to. Same as in org.eclipse.jgit.merge.MergeResult#add

org.eclipse.jgit.merge back to summary

public final Enum MergeChunk.ConflictState

Class Inheritance

extends Enum<MergeChunk.ConflictState>

java.lang.Object
java.lang.Enum
org.eclipse.jgit.merge.MergeChunk.ConflictState

A state telling whether a MergeChunk belongs to a conflict or not. The first chunk of a conflict is reported with a special state to be able to distinguish the border between two consecutive conflicts

Field Summary

Modifier and Type	Field and Description
public static final MergeChunk.ConflictState	BASE_CONFLICTING_RANGE This chunk does belong to a conflict and is the base section of the conflicting chunks
public static final MergeChunk.ConflictState	FIRST_CONFLICTING_RANGE This chunk does belong to a conflict and is the ours section of the conflicting chunks
public static final MergeChunk.ConflictState	NEXT_CONFLICTING_RANGE This chunk does belong to a conflict and is the theirs section of the conflicting chunks.
public static final MergeChunk.ConflictState	NO_CONFLICT This chunk does not belong to a conflict

Constructor Summary

Access	Constructor and Description
private	ConflictState()

Method Summary

Modifier and Type	Method and Description
public static MergeChunk.ConflictState	valueOf(String name)
public static MergeChunk.ConflictState[]	values()

Inherited from java.lang.Enum:: clone compareTo describeConstable equals finalize getDeclaringClass hashCode name ordinal toString valueOf

Field Detail

BASE_CONFLICTING_RANGE	back to summary
public static final MergeChunk.ConflictState BASE_CONFLICTING_RANGE This chunk does belong to a conflict and is the base section of the conflicting chunks Since 6.7

BASE_CONFLICTING_RANGE

back to summary

public static final MergeChunk.ConflictState BASE_CONFLICTING_RANGE

This chunk does belong to a conflict and is the base section of the conflicting chunks

Since: 6.7

FIRST_CONFLICTING_RANGE	back to summary
public static final MergeChunk.ConflictState FIRST_CONFLICTING_RANGE This chunk does belong to a conflict and is the ours section of the conflicting chunks

NEXT_CONFLICTING_RANGE	back to summary
public static final MergeChunk.ConflictState NEXT_CONFLICTING_RANGE This chunk does belong to a conflict and is the theirs section of the conflicting chunks. It's a subsequent one.

NO_CONFLICT	back to summary
public static final MergeChunk.ConflictState NO_CONFLICT This chunk does not belong to a conflict

Constructor Detail

ConflictState	back to summary
private ConflictState()

Method Detail

valueOf	back to summary
public static MergeChunk.ConflictState valueOf(String name)

values	back to summary
public static MergeChunk.ConflictState[] values()

public Class MergeChunk

Nested and Inner Type Summary

Field Summary

Constructor Summary

Method Summary

Field Detail

Constructor Detail

Method Detail

public final Enum MergeChunk.ConflictState

Field Summary

Constructor Summary

Method Summary

Field Detail

Constructor Detail

Method Detail