From cf9aa7ff3337e83ccf86251f06b48f2fbcdefac7 Mon Sep 17 00:00:00 2001 From: Chris Cameron Date: Thu, 12 Oct 2017 10:47:10 -0400 Subject: [PATCH] Consolidating IcdXmlTextWriter partials --- .../ICD.Common.Utils_SimplSharp.csproj | 1 - .../Xml/IcdXmlTextWriter.SimplSharp.cs | 94 ------------- .../Xml/IcdXmlTextWriter.Standard.cs | 102 -------------- ICD.Common.Utils/Xml/IcdXmlTextWriter.cs | 132 +++++++++++++++++- 4 files changed, 131 insertions(+), 198 deletions(-) delete mode 100644 ICD.Common.Utils/Xml/IcdXmlTextWriter.SimplSharp.cs delete mode 100644 ICD.Common.Utils/Xml/IcdXmlTextWriter.Standard.cs diff --git a/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj b/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj index c933b22..7e4e1f1 100644 --- a/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj +++ b/ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj @@ -162,7 +162,6 @@ - diff --git a/ICD.Common.Utils/Xml/IcdXmlTextWriter.SimplSharp.cs b/ICD.Common.Utils/Xml/IcdXmlTextWriter.SimplSharp.cs deleted file mode 100644 index 7abd905..0000000 --- a/ICD.Common.Utils/Xml/IcdXmlTextWriter.SimplSharp.cs +++ /dev/null @@ -1,94 +0,0 @@ -#if SIMPLSHARP -using System.Text; -using Crestron.SimplSharp.CrestronXml; -using ICD.Common.Utils.IO; - -namespace ICD.Common.Utils.Xml -{ - public sealed partial class IcdXmlTextWriter - { - private readonly XmlTextWriter m_Writer; - - public XmlWriter WrappedWriter { get { return m_Writer; } } - - /// - /// Constructor. - /// - /// - /// - public IcdXmlTextWriter(IcdStream stream, Encoding encoding) - : this(new XmlTextWriter(stream.WrappedStream, encoding)) - { - } - - /// - /// Constructor. - /// - /// - public IcdXmlTextWriter(IcdTextWriter textWriter) - : this(new XmlTextWriter(textWriter.WrappedTextWriter)) - { - } - - /// - /// Constructor. - /// - /// - public IcdXmlTextWriter(XmlTextWriter writer) - { - m_Writer = writer; - m_Writer.Formatting = Formatting.Indented; - } - - #region Methods - - public void WriteStartElement(string elementName) - { - m_Writer.WriteStartElement(elementName); - } - - public void WriteElementString(string elementName, string value) - { - m_Writer.WriteElementString(elementName, value); - } - - public void WriteEndElement() - { - m_Writer.WriteEndElement(); - } - - public void WriteComment(string comment) - { - m_Writer.WriteComment(comment); - } - - public void Dispose() - { - m_Writer.Dispose(true); - } - - public void WriteAttributeString(string attributeName, string value) - { - m_Writer.WriteAttributeString(attributeName, value); - } - - public void Flush() - { - m_Writer.Flush(); - } - - public void Close() - { - m_Writer.Close(); - } - - public void WriteRaw(string xml) - { - m_Writer.WriteRaw(xml); - } - - #endregion - } -} - -#endif diff --git a/ICD.Common.Utils/Xml/IcdXmlTextWriter.Standard.cs b/ICD.Common.Utils/Xml/IcdXmlTextWriter.Standard.cs deleted file mode 100644 index d085a83..0000000 --- a/ICD.Common.Utils/Xml/IcdXmlTextWriter.Standard.cs +++ /dev/null @@ -1,102 +0,0 @@ -using System.Text; -using System.Xml; -using ICD.Common.Utils.IO; - -namespace ICD.Common.Utils.Xml -{ - public sealed partial class IcdXmlTextWriter - { - private readonly XmlWriter m_Writer; - - public XmlWriter WrappedWriter { get { return m_Writer; } } - - /// - /// Constructor. - /// - /// - /// - public IcdXmlTextWriter(IcdStream stream, Encoding encoding) - : this(XmlWriter.Create(stream.WrappedStream, GetSettings(encoding))) - { - } - - /// - /// Constructor. - /// - /// - public IcdXmlTextWriter(IcdTextWriter textWriter) - : this(XmlWriter.Create(textWriter.WrappedTextWriter)) - { - } - - /// - /// Constructor. - /// - /// - public IcdXmlTextWriter(XmlWriter writer) - { - m_Writer = writer; - } - - #region Methods - - public void WriteStartElement(string elementName) - { - m_Writer.WriteStartElement(elementName); - } - - public void WriteElementString(string elementName, string value) - { - m_Writer.WriteElementString(elementName, value); - } - - public void WriteEndElement() - { - m_Writer.WriteEndElement(); - } - - public void WriteComment(string comment) - { - m_Writer.WriteComment(comment); - } - - public void Dispose() - { - m_Writer.Dispose(); - } - - public void WriteAttributeString(string attributeName, string value) - { - m_Writer.WriteAttributeString(attributeName, value); - } - - public void Flush() - { - m_Writer.Flush(); - } - - public void Close() - { - } - - public void WriteRaw(string xml) - { - m_Writer.WriteRaw(xml); - } - - #endregion - - #region Private Methods - - private static XmlWriterSettings GetSettings(Encoding encoding) - { - return new XmlWriterSettings - { - Encoding = encoding, - Indent = true - }; - } - - #endregion - } -} diff --git a/ICD.Common.Utils/Xml/IcdXmlTextWriter.cs b/ICD.Common.Utils/Xml/IcdXmlTextWriter.cs index 4e04573..f65f154 100644 --- a/ICD.Common.Utils/Xml/IcdXmlTextWriter.cs +++ b/ICD.Common.Utils/Xml/IcdXmlTextWriter.cs @@ -1,8 +1,138 @@ using System; +using System.Text; +using ICD.Common.Utils.IO; +#if SIMPLSHARP +using Crestron.SimplSharp.CrestronXml; +#else +using System.Xml; +#endif namespace ICD.Common.Utils.Xml { - public sealed partial class IcdXmlTextWriter : IDisposable + public sealed class IcdXmlTextWriter : IDisposable { +#if SIMPLSHARP + private readonly XmlTextWriter m_Writer; +#else + private readonly XmlWriter m_Writer; +#endif + + public XmlWriter WrappedWriter { get { return m_Writer; } } + + /// + /// Constructor. + /// + /// + /// + public IcdXmlTextWriter(IcdStream stream, Encoding encoding) +#if SIMPLSHARP + : this(new XmlTextWriter(stream.WrappedStream, encoding)) +#else + : this(XmlWriter.Create(stream.WrappedStream, GetSettings(encoding))) +#endif + { + } + + /// + /// Constructor. + /// + /// + public IcdXmlTextWriter(IcdTextWriter textWriter) +#if SIMPLSHARP + : this(new XmlTextWriter(textWriter.WrappedTextWriter)) +#else + : this(XmlWriter.Create(textWriter.WrappedTextWriter)) +#endif + { + } + + /// + /// Constructor. + /// + /// +#if SIMPLSHARP + private IcdXmlTextWriter(XmlTextWriter writer) +#else + private IcdXmlTextWriter(XmlWriter writer) +#endif + { + m_Writer = writer; + +#if SIMPLSHARP + m_Writer.Formatting = Formatting.Indented; +#endif + } + + #region Methods + + public void WriteStartElement(string elementName) + { + m_Writer.WriteStartElement(elementName); + } + + public void WriteElementString(string elementName, string value) + { + m_Writer.WriteElementString(elementName, value); + } + + public void WriteEndElement() + { + m_Writer.WriteEndElement(); + } + + public void WriteComment(string comment) + { + m_Writer.WriteComment(comment); + } + + public void Dispose() + { +#if SIMPLSHARP + m_Writer.Dispose(true); +#else + m_Writer.Dispose(); +#endif + } + + public void WriteAttributeString(string attributeName, string value) + { + m_Writer.WriteAttributeString(attributeName, value); + } + + public void Flush() + { + m_Writer.Flush(); + } + + public void Close() + { +#if SIMPLSHARP + m_Writer.Close(); +#else + m_Writer.Dispose(); +#endif + } + + public void WriteRaw(string xml) + { + m_Writer.WriteRaw(xml); + } + +#endregion + +#region Private Methods + +#if STANDARD + private static XmlWriterSettings GetSettings(Encoding encoding) + { + return new XmlWriterSettings + { + Encoding = encoding, + Indent = true + }; + } +#endif + +#endregion } }