diff options
author | Mike Krüger <mkrueger@xamarin.com> | 2012-03-11 01:52:11 +0400 |
---|---|---|
committer | Mike Krüger <mkrueger@xamarin.com> | 2012-03-11 01:52:11 +0400 |
commit | 847d26a6139591c6f3dcd94e46883b20a6d3c1d4 (patch) | |
tree | 1be3b6a5f7fe53944c1a5ca0ff0531dfb9dbcb0b /main/src/addins/VersionControl | |
parent | 2d89c7e3ad3988d0e9d36bd6e314428b5717c57a (diff) |
[TextEditor] Changed 'Document' to 'TextDocument' to prevent name
clashes with MonoDevelop.Ide.Gui.Document
Diffstat (limited to 'main/src/addins/VersionControl')
7 files changed, 15 insertions, 15 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs index d9705d1100..5fb50510e4 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion/SubversionRepository.cs @@ -521,8 +521,8 @@ namespace MonoDevelop.VersionControl.Subversion {
List<Annotation> annotations = new List<Annotation> (Svn.GetAnnotations (this, localPath, SvnRevision.First, SvnRevision.Base));
Annotation nextRev = new Annotation (GettextCatalog.GetString ("working copy"), "", DateTime.MinValue);
- var baseDocument = new Mono.TextEditor.Document (File.ReadAllText (GetPathToBaseText (localPath)));
- var workingDocument = new Mono.TextEditor.Document (File.ReadAllText (localPath));
+ var baseDocument = new Mono.TextEditor.TextDocument (File.ReadAllText (GetPathToBaseText (localPath)));
+ var workingDocument = new Mono.TextEditor.TextDocument (File.ReadAllText (localPath));
// "SubversionException: blame of the WORKING revision is not supported"
foreach (var hunk in baseDocument.Diff (workingDocument)) {
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs index ecc20e86b5..27d518753f 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs @@ -337,7 +337,7 @@ namespace MonoDevelop.VersionControl.Views sb.Append (ch); } - Document doc = new Document (); + var doc = new TextDocument (); doc.Text = sb.ToString (); for (int i = 1; i <= doc.LineCount; i++) { string text = doc.GetLineText (i).Trim (); diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs index 5112875a88..3604f6bec6 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/ComparisonWidget.cs @@ -74,8 +74,8 @@ namespace MonoDevelop.VersionControl.Views protected override void CreateComponents () { this.editors = new [] { - new TextEditor (new Mono.TextEditor.Document (), new CommonTextEditorOptions ()), - new TextEditor (new Mono.TextEditor.Document (), new CommonTextEditorOptions ()), + new TextEditor (new Mono.TextEditor.TextDocument (), new CommonTextEditorOptions ()), + new TextEditor (new Mono.TextEditor.TextDocument (), new CommonTextEditorOptions ()), }; if (!viewOnly) { diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs index f97e5bdc78..a1c32d5332 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DiffWidget.cs @@ -89,7 +89,7 @@ namespace MonoDevelop.VersionControl.Views }; comparisonWidget.SetVersionControlInfo (info); this.buttonDiff.Clicked += HandleButtonDiffhandleClicked; - diffTextEditor = new global::Mono.TextEditor.TextEditor (new Mono.TextEditor.Document (), new CommonTextEditorOptions ()); + diffTextEditor = new global::Mono.TextEditor.TextEditor (new Mono.TextEditor.TextDocument (), new CommonTextEditorOptions ()); diffTextEditor.Document.MimeType = "text/x-diff"; diffTextEditor.Options.ShowFoldMargin = false; diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs index 6e739875a6..4ddcc1ea57 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs @@ -574,7 +574,7 @@ namespace MonoDevelop.VersionControl.Views } } - Dictionary<Mono.TextEditor.Document, TextEditorData> dict = new Dictionary<Mono.TextEditor.Document, TextEditorData> (); + Dictionary<Mono.TextEditor.TextDocument, TextEditorData> dict = new Dictionary<Mono.TextEditor.TextDocument, TextEditorData> (); List<TextEditorData> localUpdate = new List<TextEditorData> (); @@ -616,7 +616,7 @@ namespace MonoDevelop.VersionControl.Views void HandleDataDocumentTextReplaced (object sender, DocumentChangeEventArgs e) { - var data = dict [(Document)sender]; + var data = dict [(TextDocument)sender]; localUpdate.Remove (data); var editor = info.Document.GetContent<IEditableTextFile> (); editor.DeleteText (e.Offset, e.RemovalLength); diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs index 281698aa98..0c055fd0cc 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/LogWidget.cs @@ -338,7 +338,7 @@ namespace MonoDevelop.VersionControl.Views return; } string[] lines; - var changedDocument = new Mono.TextEditor.Document (text); + var changedDocument = new Mono.TextEditor.TextDocument (text); if (prevRev == null) { lines = new string[changedDocument.LineCount]; for (int i = 0; i < changedDocument.LineCount; i++) { @@ -353,7 +353,7 @@ namespace MonoDevelop.VersionControl.Views // The file did not exist at this point in time, so just treat it as empty } - var originalDocument = new Mono.TextEditor.Document (prevRevisionText); + var originalDocument = new Mono.TextEditor.TextDocument (prevRevisionText); originalDocument.FileName = "Revision " + prevRev.ToString (); changedDocument.FileName = "Revision " + rev.ToString (); lines = Mono.TextEditor.Utils.Diff.GetDiffString (originalDocument, changedDocument).Split ('\n'); 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 8a43ab04a4..fc73d51fd9 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 @@ -108,9 +108,9 @@ namespace MonoDevelop.VersionControl.Views protected override void CreateComponents () { this.editors = new [] { - new TextEditor (new Mono.TextEditor.Document (), new CommonTextEditorOptions ()), - new TextEditor (new Mono.TextEditor.Document (), new CommonTextEditorOptions ()), - new TextEditor (new Mono.TextEditor.Document (), new CommonTextEditorOptions ()), + new TextEditor (new Mono.TextEditor.TextDocument (), new CommonTextEditorOptions ()), + new TextEditor (new Mono.TextEditor.TextDocument (), new CommonTextEditorOptions ()), + new TextEditor (new Mono.TextEditor.TextDocument (), new CommonTextEditorOptions ()), }; this.editors[0].Document.ReadOnly = true; @@ -124,7 +124,7 @@ namespace MonoDevelop.VersionControl.Views } // todo: move to version control backend - IEnumerable<Conflict> Conflicts (Mono.TextEditor.Document doc) + IEnumerable<Conflict> Conflicts (Mono.TextEditor.TextDocument doc) { foreach (int mergeStart in doc.SearchForward ("<<<<<<<", 0)) { LineSegment start = doc.GetLineByOffset (mergeStart); @@ -249,7 +249,7 @@ namespace MonoDevelop.VersionControl.Views void UpdateConflictsOnTextReplace (object sender, DocumentChangeEventArgs e) { this.UpdateDiff (); - Mono.TextEditor.Document.UpdateSegments (GetAllConflictingSegments (), e); + Mono.TextEditor.TextDocument.UpdateSegments (GetAllConflictingSegments (), e); } } }
\ No newline at end of file |