[SourceEditor] Unified text document subsystems.

1 files changed, 9 insertions, 9 deletions

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
index b36bc27202..83b859406c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/MergeWidget.cs
@@ -106,8 +106,8 @@ namespace MonoDevelop.VersionControl.Views
 				new MonoTextEditor (new TextDocument (), CommonTextEditorOptions.Instance),
 			};
 			
-			this.editors[0].Document.ReadOnly = true;
-			this.editors[2].Document.ReadOnly = true;
+			this.editors[0].Document.IsReadOnly = true;
+			this.editors[2].Document.IsReadOnly = true;
 			
 			Label myVersion = new Label (GettextCatalog.GetString ("My"));
 			Label currentVersion = new Label (GettextCatalog.GetString ("Current"));
@@ -213,14 +213,14 @@ namespace MonoDevelop.VersionControl.Views
 				Conflict conflict = currentConflicts[i];
 
 				string above = MainEditor.Document.GetTextBetween (curOffset, conflict.StartSegment.Offset);
-				editors[0].Insert (editors[0].Document.TextLength, above);
+				editors[0].Insert (editors[0].Document.Length, above);
 				int leftA = editors[0].Document.LineCount;
-				editors[0].Insert (editors[0].Document.TextLength, MainEditor.Document.GetTextAt (conflict.MySegment));
+				editors[0].Insert (editors[0].Document.Length, MainEditor.Document.GetTextAt (conflict.MySegment));
 				int leftB = editors[0].Document.LineCount;
 
-				editors[2].Insert (editors[2].Document.TextLength, above);
+				editors[2].Insert (editors[2].Document.Length, above);
 				int rightA = editors[2].Document.LineCount;
-				editors[2].Insert (editors[2].Document.TextLength, MainEditor.Document.GetTextAt (conflict.TheirSegment));
+				editors[2].Insert (editors[2].Document.Length, MainEditor.Document.GetTextAt (conflict.TheirSegment));
 				int rightB = editors[2].Document.LineCount;
 
 				int middleA = MainEditor.Document.OffsetToLineNumber (conflict.StartSegment.Offset);
@@ -233,9 +233,9 @@ namespace MonoDevelop.VersionControl.Views
 			if (currentConflicts.Count > 0)
 				endOffset = currentConflicts.Last ().EndSegment.EndOffset;
 
-			string lastPart = MainEditor.Document.GetTextBetween (endOffset, MainEditor.Document.TextLength);
-			editors[0].Insert (editors[0].Document.TextLength, lastPart);
-			editors[2].Insert (editors[2].Document.TextLength, lastPart);
+			string lastPart = MainEditor.Document.GetTextBetween (endOffset, MainEditor.Document.Length);
+			editors[0].Insert (editors[0].Document.Length, lastPart);
+			editors[2].Insert (editors[2].Document.Length, lastPart);
 
 			UpdateDiff ();
 		}