Class XmlDocumentMerger


  • public class XmlDocumentMerger
    extends com._1c.g5.gumtree.core.merge.AbstractDocumentMerger
    DocumentMerger using the Gumtree comparison algorithm to do 2- or 3-way diff between xml files.
    • Nested Class Summary

      • Nested classes/interfaces inherited from class org.eclipse.compare.internal.merge.DocumentMerger

        org.eclipse.compare.internal.merge.DocumentMerger.Diff, org.eclipse.compare.internal.merge.DocumentMerger.IDocumentMergerInput
    • Field Summary

      • Fields inherited from class com._1c.g5.gumtree.core.merge.AbstractDocumentMerger

        differ
    • Constructor Summary

      Constructors 
      Constructor Description
      XmlDocumentMerger​(org.eclipse.compare.internal.merge.DocumentMerger.IDocumentMergerInput input)
      Creates a new XmlDocumentMerger with the given input.
    • Method Summary

      All Methods Instance Methods Concrete Methods 
      Modifier and Type Method Description
      protected void runGumtreeDiff​(org.eclipse.jface.text.IDocument leftDocument, org.eclipse.jface.text.IDocument rightDocument, org.eclipse.jface.text.IDocument ancestorDocument)  
      • Methods inherited from class com._1c.g5.gumtree.core.merge.AbstractDocumentMerger

        doDiff, isGumtreeDiffSuccessful, setActualDiffs
      • Methods inherited from class org.eclipse.compare.internal.merge.DocumentMerger

        changesCount, changesIterator, copy, findDiff, findDiff, findDiff, findDiff, findDiff, findInsertionPoint, findNext, findPrev, getChangeDiffs, getCompareConfiguration, getLineRange, getRightHeight, getVirtualHeight, getWrappedDiff, hasChanges, isFirstChildDiff, isIgnoreAncestor, isThreeWay, rangesIterator, realToVirtualPosition, reset, useChange, virtualToRealPosition
    • Constructor Detail

      • XmlDocumentMerger

        public XmlDocumentMerger​(org.eclipse.compare.internal.merge.DocumentMerger.IDocumentMergerInput input)
        Creates a new XmlDocumentMerger with the given input.
        Parameters:
        input - the given input to the document merge process, can not be null
    • Method Detail

      • runGumtreeDiff

        protected void runGumtreeDiff​(org.eclipse.jface.text.IDocument leftDocument,
                                      org.eclipse.jface.text.IDocument rightDocument,
                                      org.eclipse.jface.text.IDocument ancestorDocument)
                               throws com._1c.g5.gumtree.core.tree.TreeGeneratorException
        Specified by:
        runGumtreeDiff in class com._1c.g5.gumtree.core.merge.AbstractDocumentMerger
        Throws:
        com._1c.g5.gumtree.core.tree.TreeGeneratorException