Browse Source

added remarks to baseDocument initialization

pull/15/head
Siegfried Pammer 15 years ago
parent
commit
807157d19d
  1. 8
      src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs

8
src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/DefaultChangeWatcher.cs

@ -54,8 +54,10 @@ namespace ICSharpCode.AvalonEdit.AddIn
Stream baseFileStream = GetBaseVersion(); Stream baseFileStream = GetBaseVersion();
if (baseFileStream != null) // TODO : update baseDocument on VCS actions
if (baseFileStream != null) {
baseDocument = DocumentUtilitites.LoadReadOnlyDocumentFromBuffer(new StringTextBuffer(ReadAll(baseFileStream))); baseDocument = DocumentUtilitites.LoadReadOnlyDocumentFromBuffer(new StringTextBuffer(ReadAll(baseFileStream)));
}
SetupInitialFileState(false); SetupInitialFileState(false);
@ -77,8 +79,8 @@ namespace ICSharpCode.AvalonEdit.AddIn
if (update) if (update)
changeList.Transform(TransformLineChangeInfo); changeList.Transform(TransformLineChangeInfo);
else else
changeList.InsertRange(0, document.TotalNumberOfLines + 1, new LineChangeInfo(ChangeType.None, "")); changeList.InsertRange(0, document.TotalNumberOfLines + 1, LineChangeInfo.Empty);
}else { } else {
changeList.Clear(); changeList.Clear();
MyersDiff.MyersDiff diff = new MyersDiff.MyersDiff( MyersDiff.MyersDiff diff = new MyersDiff.MyersDiff(

Loading…
Cancel
Save