Browse Source

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).
pull/59/merge
Daniel Grunwald 12 years ago
parent
commit
95d8b95013
  1. 4
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedLine.cs
  2. 2
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HtmlRichTextWriter.cs
  3. 4
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/RichTextModelWriter.cs
  4. 2
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Utils/PlainRichTextWriter.cs
  5. 2
      src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Utils/RichTextWriter.cs

4
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HighlightedLine.cs

@ -205,7 +205,7 @@ namespace ICSharpCode.AvalonEdit.Highlighting
/// <summary> /// <summary>
/// Writes the highlighted line to the RichTextWriter. /// Writes the highlighted line to the RichTextWriter.
/// </summary> /// </summary>
public void WriteTo(RichTextWriter writer) internal void WriteTo(RichTextWriter writer)
{ {
int startOffset = this.DocumentLine.Offset; int startOffset = this.DocumentLine.Offset;
WriteTo(writer, startOffset, startOffset + this.DocumentLine.Length); WriteTo(writer, startOffset, startOffset + this.DocumentLine.Length);
@ -214,7 +214,7 @@ namespace ICSharpCode.AvalonEdit.Highlighting
/// <summary> /// <summary>
/// Writes a part of the highlighted line to the RichTextWriter. /// Writes a part of the highlighted line to the RichTextWriter.
/// </summary> /// </summary>
public void WriteTo(RichTextWriter writer, int startOffset, int endOffset) internal void WriteTo(RichTextWriter writer, int startOffset, int endOffset)
{ {
if (writer == null) if (writer == null)
throw new ArgumentNullException("writer"); throw new ArgumentNullException("writer");

2
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/HtmlRichTextWriter.cs

@ -15,7 +15,7 @@ namespace ICSharpCode.AvalonEdit.Highlighting
/// <summary> /// <summary>
/// RichTextWriter implementation that produces HTML. /// RichTextWriter implementation that produces HTML.
/// </summary> /// </summary>
public class HtmlRichTextWriter : RichTextWriter class HtmlRichTextWriter : RichTextWriter
{ {
readonly TextWriter htmlWriter; readonly TextWriter htmlWriter;
readonly HtmlOptions options; readonly HtmlOptions options;

4
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Highlighting/RichTextModelWriter.cs

@ -14,9 +14,9 @@ using ICSharpCode.AvalonEdit.Utils;
namespace ICSharpCode.AvalonEdit.Highlighting namespace ICSharpCode.AvalonEdit.Highlighting
{ {
/// <summary> /// <summary>
/// A RichTextWriter that writes into a document and . /// A RichTextWriter that writes into a document and RichTextModel.
/// </summary> /// </summary>
public class RichTextModelWriter : PlainRichTextWriter class RichTextModelWriter : PlainRichTextWriter
{ {
readonly RichTextModel richTextModel; readonly RichTextModel richTextModel;
readonly DocumentTextWriter documentTextWriter; readonly DocumentTextWriter documentTextWriter;

2
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Utils/PlainRichTextWriter.cs

@ -11,7 +11,7 @@ namespace ICSharpCode.AvalonEdit.Utils
/// RichTextWriter implementation that writes plain text only /// RichTextWriter implementation that writes plain text only
/// and ignores all formatted spans. /// and ignores all formatted spans.
/// </summary> /// </summary>
public class PlainRichTextWriter : RichTextWriter class PlainRichTextWriter : RichTextWriter
{ {
/// <summary> /// <summary>
/// The text writer that was passed to the PlainRichTextWriter constructor. /// The text writer that was passed to the PlainRichTextWriter constructor.

2
src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Utils/RichTextWriter.cs

@ -12,7 +12,7 @@ namespace ICSharpCode.AvalonEdit.Utils
/// <summary> /// <summary>
/// A text writer that supports creating spans of highlighted text. /// A text writer that supports creating spans of highlighted text.
/// </summary> /// </summary>
public abstract class RichTextWriter : TextWriter abstract class RichTextWriter : TextWriter
{ {
/// <summary> /// <summary>
/// Gets called by the RichTextWriter base class when a BeginSpan() method /// Gets called by the RichTextWriter base class when a BeginSpan() method

Loading…
Cancel
Save