protected DiffDisplayAlgorithm(ucTextMergeEditor editor)
{
mergeEditor = editor;
editorOriginal = editor.EditorOriginal;
editorResolved = editor.EditorResolved;
fileInformation = editor.FileInformation;
}
protected DiffDisplayAlgorithm(ucTextMergeEditor editor)
{
mergeEditor = editor;
editorOriginal = editor.EditorOriginal;
editorResolved = editor.EditorResolved;
fileInformation = editor.FileInformation;
}
public TwoWayDiffDisplayAlgorithm(ucTextMergeEditor mergeEditor)
: base(mergeEditor)
{
}
public ThreeWayDiffDisplayAlgorithm(ucTextMergeEditor editor)
: base(editor)
{
}
public NullDiffDisplayAlgorithm(ucTextMergeEditor editor)
: base(editor)
{
}
private void ucTextMergeEditor1_MergedFileSavedEvent(object sender, ucTextMergeEditor.MergedFileSavedEventArgs e)
{
CodeRootMapNode CurrentMapInfo = (CodeRootMapNode)treeListObjects.SelectedNode.Tag;
string mergedCode = e.MergedFile.GetContents();
CurrentMapInfo.SetMergedBaseConstruct(mergedCode);
// Write the resolved changes to the merged file
FileInformation.MergedFile = new TextFile(FileInformation.CodeRootMap.GetMergedCodeRoot().ToString());
FileInformation.PerformSuperDiff();
FireFileUpdatedEvent();
PopulateGrid();
}
public ThreeWayDiffDisplayAlgorithm(ucTextMergeEditor editor)
: base(editor)
{
}
public TwoWayDiffDisplayAlgorithm(ucTextMergeEditor mergeEditor)
: base(mergeEditor)
{
}
public NullDiffDisplayAlgorithm(ucTextMergeEditor editor)
: base(editor)
{
}
