2002-12-21 Atsushi Enomoto <ginga@kit.hi-ho.ne.jp>

[mono.git] / mcs / class / System.XML / System.Xml / XmlComment.cs

diff --git a/mcs/class/System.XML/System.Xml/XmlComment.cs b/mcs/class/System.XML/System.Xml/XmlComment.cs
index f6d650654223e3872c4b8c00e8a8d19b82bda157..a515a1a95f9cdd18a7d4970a347e127bb3612869 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlComment.cs
+++ b/mcs/class/System.XML/System.Xml/XmlComment.cs
@@ -1,120 +1,65 @@
+//
+// System.Xml.XmlComment
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
 using System;
+using System.Xml.XPath;
 
 namespace System.Xml
 {
-       /// <summary>
-       /// 
-       /// </summary>
-       /// 
-
-       /*
-        * Section 2.5 of the XML spec says...
-       [Definition: Comments may appear anywhere in a document outside other markup;   in addition, they may appear within the document type declaration at places     allowed by the grammar. They are not part of the document's character data;     an XML processor may, but need not, make it possible for an application to retrieve     the text of comments. For compatibility, the string "--" (double-hyphen)        must not occur within comments.] Parameter entity references are not recognized within comments.
-       
-       Note that the grammar does not allow a comment ending in --->.
-       Comment ::=   '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->'
-       */
        public class XmlComment : XmlCharacterData
        {
-               // Private data members
+               #region Constructors
 
-               // public properties
-               public override string InnerText 
+               protected internal XmlComment (string comment, XmlDocument doc)
+                       : base (comment, doc)
                {
-                       get
-                       {
-                               // TODO - implement XmlComment.InnerText.get
-                               throw new NotImplementedException();
-                       }
-                       
-                       set
-                       {
-                               // TODO - implement XmlComment.InnerText.set
-                               throw new NotImplementedException();
-                       }
                }
 
-               public override string LocalName 
-               {
-                       get
-                       {
-                               return "#comment";
-                       }
+               #endregion
+
+               #region Properties
+
+               public override string LocalName {
+                       get { return "#comment"; }
                }
 
-               public override string Name 
-               {
-                       get
-                       {
-                               return "#comment";
-                       }
+               public override string Name {
+                       get { return "#comment"; }
                }
 
-               public override string Value 
-               {
-                       get
-                       {
-                               return Fvalue;
-                       }
-                       
-                       set
-                       {
-                               // TODO - Do our well-formedness checks on Value.set? (no)
-                               Fvalue = value;
-                       }
+               public override XmlNodeType NodeType {
+                       get { return XmlNodeType.Comment; }
                }
                
-
-               // Public Methods
-               public override XmlNode CloneNode(bool deep)
-               {
-                       // TODO - implement XmlComment.CloneNode(bool)
-                       throw new NotImplementedException();
+               internal override XPathNodeType XPathNodeType {
+                       get {
+                               return XPathNodeType.Comment;
+                       }
                }
 
-               public override void WriteContentTo(XmlWriter w)
-               {
-                       // TODO - implement XmlComment.WriteContentTo(XmlWriter)
-                       throw new NotImplementedException();
-               }
+               #endregion
 
-               public override void WriteTo(XmlWriter w)
+               #region Methods
+
+               public override XmlNode CloneNode (bool deep)
                {
-                       // TODO - implement XmlComment.WriteTo(XmlWriter)
-                       throw new NotImplementedException();
+                       // discard deep because Comments have no children.
+                       return new XmlComment(Value, OwnerDocument); 
                }
 
+               public override void WriteContentTo (XmlWriter w) { }
 
-               // Internal methods
-               /// <summary>
-               /// Returns an exception object if passed text is not well-formed.
-               /// Text is passed without introductory syntax elements.
-               /// For comments, the leading "<!--" and trailing "-->" should be stripped.
-               /// </summary>
-               /// <param name="data"></param>
-               /// <returns></returns>
-               private XmlException wellFormed(string data, XmlInputSource src)
+               public override void WriteTo (XmlWriter w)
                {
-                       if (data.IndexOf("--") != -1)
-                               return new XmlException("Invalid characters (\"--\") in comment", src);
-                       if (data[0] == '-')
-                               return new XmlException("Invalid comment beginning (<!---)", src);
-                       if (data[data.Length - 1] == '-')
-                               return new XmlException("Invalid comment ending (--->)", src);
-                       return null;
-
+                       w.WriteComment (Data);
                }
-               // Constructors
-               internal XmlComment(XmlDocument aOwner, string txt, XmlInputSource src) : base(aOwner)
-               {
-                       XmlException e = wellFormed(txt, src);
 
-                       if ( e == null )
-                       {
-                               Fvalue = txt;
-                       }
-                       else
-                               throw e;
-               }
+               #endregion
        }
 }