Class XmlDocumentMerger
java.lang.Object
org.eclipse.compare.internal.merge.DocumentMerger
com._1c.g5.gumtree.core.merge.AbstractDocumentMerger
com._1c.g5.v8.dt.xml.gumtree.merge.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
ConstructorsConstructorDescriptionXmlDocumentMerger
(org.eclipse.compare.internal.merge.DocumentMerger.IDocumentMergerInput input) Creates a newXmlDocumentMerger
with the given input. -
Method Summary
Modifier and TypeMethodDescriptionprotected boolean
runGumtreeDiff
(org.eclipse.jface.text.IDocument leftDocument, org.eclipse.jface.text.IDocument rightDocument, org.eclipse.jface.text.IDocument ancestorDocument, org.eclipse.core.runtime.IProgressMonitor monitor) Methods inherited from class com._1c.g5.gumtree.core.merge.AbstractDocumentMerger
doDiff, isGumtreeDiffSuccessful, runGumtreeDiff, 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 Details
-
XmlDocumentMerger
public XmlDocumentMerger(org.eclipse.compare.internal.merge.DocumentMerger.IDocumentMergerInput input) Creates a newXmlDocumentMerger
with the given input.- Parameters:
input
- the given input to the document merge process, can not benull
-
-
Method Details
-
runGumtreeDiff
protected boolean runGumtreeDiff(org.eclipse.jface.text.IDocument leftDocument, org.eclipse.jface.text.IDocument rightDocument, org.eclipse.jface.text.IDocument ancestorDocument, org.eclipse.core.runtime.IProgressMonitor monitor) throws com._1c.g5.gumtree.core.tree.TreeGeneratorException - Overrides:
runGumtreeDiff
in classcom._1c.g5.gumtree.core.merge.AbstractDocumentMerger
- Throws:
com._1c.g5.gumtree.core.tree.TreeGeneratorException
-