Class MergeFormatterPass


  • class MergeFormatterPass
    extends java.lang.Object
    • Field Detail

      • 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 - the OutputStream where to write the textual presentation
        res - the merge result which should be presented
        seqName - 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 list
        charset - 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