From 95d8b95013571a42baf95dcb6bde3c915a6c2dc2 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Thu, 8 Aug 2013 23:19:46 +0200 Subject: [PATCH] Make RichTextWriter and derived classes internal; they're not necessary for using RichText/RichTextModel anymore. If no new usecase comes up, these classes can be deleted (except maybe for HtmlRichTextWriter). --- .../ICSharpCode.AvalonEdit/Highlighting/HighlightedLine.cs | 4 ++-- .../ICSharpCode.AvalonEdit/Highlighting/HtmlRichTextWriter.cs | 2 +- .../Highlighting/RichTextModelWriter.cs | 4 ++-- .../ICSharpCode.AvalonEdit/Utils/PlainRichTextWriter.cs | 2 +- .../AvalonEdit/ICSharpCode.AvalonEdit/Utils/RichTextWriter.cs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedLine.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedLine.cs index 90ab30f757..23bfe74583 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedLine.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedLine.cs @@ -205,7 +205,7 @@ namespace ICSharpCode.AvalonEdit.Highlighting /// /// Writes the highlighted line to the RichTextWriter. /// - public void WriteTo(RichTextWriter writer) + internal void WriteTo(RichTextWriter writer) { int startOffset = this.DocumentLine.Offset; WriteTo(writer, startOffset, startOffset + this.DocumentLine.Length); @@ -214,7 +214,7 @@ namespace ICSharpCode.AvalonEdit.Highlighting /// /// Writes a part of the highlighted line to the RichTextWriter. /// - public void WriteTo(RichTextWriter writer, int startOffset, int endOffset) + internal void WriteTo(RichTextWriter writer, int startOffset, int endOffset) { if (writer == null) throw new ArgumentNullException("writer"); diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HtmlRichTextWriter.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HtmlRichTextWriter.cs index 1c2a48d036..1fa54f81d5 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HtmlRichTextWriter.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HtmlRichTextWriter.cs @@ -15,7 +15,7 @@ namespace ICSharpCode.AvalonEdit.Highlighting /// /// RichTextWriter implementation that produces HTML. /// - public class HtmlRichTextWriter : RichTextWriter + class HtmlRichTextWriter : RichTextWriter { readonly TextWriter htmlWriter; readonly HtmlOptions options; diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/RichTextModelWriter.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/RichTextModelWriter.cs index 777fea51e1..fc12a8f56a 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/RichTextModelWriter.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/RichTextModelWriter.cs @@ -14,9 +14,9 @@ using ICSharpCode.AvalonEdit.Utils; namespace ICSharpCode.AvalonEdit.Highlighting { /// - /// A RichTextWriter that writes into a document and . + /// A RichTextWriter that writes into a document and RichTextModel. /// - public class RichTextModelWriter : PlainRichTextWriter + class RichTextModelWriter : PlainRichTextWriter { readonly RichTextModel richTextModel; readonly DocumentTextWriter documentTextWriter; diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Utils/PlainRichTextWriter.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Utils/PlainRichTextWriter.cs index 3a43e41cde..610f005a09 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Utils/PlainRichTextWriter.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Utils/PlainRichTextWriter.cs @@ -11,7 +11,7 @@ namespace ICSharpCode.AvalonEdit.Utils /// RichTextWriter implementation that writes plain text only /// and ignores all formatted spans. /// - public class PlainRichTextWriter : RichTextWriter + class PlainRichTextWriter : RichTextWriter { /// /// The text writer that was passed to the PlainRichTextWriter constructor. diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Utils/RichTextWriter.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Utils/RichTextWriter.cs index 8261d54e41..49b884d1c0 100644 --- a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Utils/RichTextWriter.cs +++ b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Utils/RichTextWriter.cs @@ -12,7 +12,7 @@ namespace ICSharpCode.AvalonEdit.Utils /// /// A text writer that supports creating spans of highlighted text. /// - public abstract class RichTextWriter : TextWriter + abstract class RichTextWriter : TextWriter { /// /// Gets called by the RichTextWriter base class when a BeginSpan() method