Package org.eclipse.jgit.merge
Class MergeFormatterPass
- java.lang.Object
-
- org.eclipse.jgit.merge.MergeFormatterPass
-
class MergeFormatterPass extends java.lang.Object
-
-
Field Summary
Fields Modifier and Type Field Description private java.nio.charset.Charset
charset
private java.lang.String
lastConflictingName
private EolAwareOutputStream
out
private MergeResult<RawText>
res
private java.util.List<java.lang.String>
seqName
private boolean
threeWayMerge
-
Constructor Summary
Constructors Constructor Description MergeFormatterPass(java.io.OutputStream out, MergeResult<RawText> res, java.util.List<java.lang.String> seqName, java.nio.charset.Charset charset)
-
Method Summary
All Methods Instance Methods Concrete Methods Modifier and Type Method Description (package private) void
formatMerge()
private void
writeConflictChange(MergeChunk chunk)
private void
writeConflictEnd()
private void
writeConflictMetadata(MergeChunk chunk)
private void
writeConflictStart(MergeChunk chunk)
private void
writeLine(RawText seq, int i)
private void
writeln(java.lang.String s)
-
-
-
Field Detail
-
out
private final EolAwareOutputStream out
-
res
private final MergeResult<RawText> res
-
seqName
private final java.util.List<java.lang.String> seqName
-
charset
private final java.nio.charset.Charset charset
-
threeWayMerge
private final boolean threeWayMerge
-
lastConflictingName
private java.lang.String lastConflictingName
-
-
Constructor Detail
-
MergeFormatterPass
MergeFormatterPass(java.io.OutputStream out, MergeResult<RawText> res, java.util.List<java.lang.String> seqName, java.nio.charset.Charset charset)
- Parameters:
out
- theOutputStream
where to write the textual presentationres
- the merge result which should be presentedseqName
- When a conflict is reported each conflicting range will get a name. This name is following the "<<<<<<< " or ">>>>>>> " conflict markers. The names for the sequences are given in this listcharset
- the character set used when writing conflict metadata
-
-
Method Detail
-
formatMerge
void formatMerge() throws java.io.IOException
- Throws:
java.io.IOException
-
writeConflictMetadata
private void writeConflictMetadata(MergeChunk chunk) throws java.io.IOException
- Throws:
java.io.IOException
-
writeConflictEnd
private void writeConflictEnd() throws java.io.IOException
- Throws:
java.io.IOException
-
writeConflictStart
private void writeConflictStart(MergeChunk chunk) throws java.io.IOException
- Throws:
java.io.IOException
-
writeConflictChange
private void writeConflictChange(MergeChunk chunk) throws java.io.IOException
- Throws:
java.io.IOException
-
writeln
private void writeln(java.lang.String s) throws java.io.IOException
- Throws:
java.io.IOException
-
writeLine
private void writeLine(RawText seq, int i) throws java.io.IOException
- Throws:
java.io.IOException
-
-