In System.Xml:

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

diff --git a/mcs/class/System.XML/System.Xml/XmlCharacterData.cs b/mcs/class/System.XML/System.Xml/XmlCharacterData.cs
index 0d5cb2c4d52226dcc71cefc25619a2ce95d2d03a..861f1d143eb3ef36bc5ca2fa951785e704635f36 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlCharacterData.cs
+++ b/mcs/class/System.XML/System.Xml/XmlCharacterData.cs
@@ -1,5 +1,5 @@
 //
-// System.Xml.XmlText
+// System.Xml.XmlCharacterData.cs
 //
 // Author:
 //   Jason Diamond <jason@injektilo.org>
@@ -17,8 +17,12 @@ namespace System.Xml
 
                #region Constructor
 
-               protected internal XmlCharacterData (string data, XmlDocument doc) : base (doc)
+               protected internal XmlCharacterData (string data, XmlDocument doc)
+                       : base (doc)
                {
+                       if (data == null)
+                               data = String.Empty;
+
                        this.data = data;
                }
 
@@ -27,40 +31,25 @@ namespace System.Xml
                #region Properties
 
                public virtual string Data {
-                       get {
-                               return data;
-                       }
+                       get { return data; }
                        
-                       set {
-                               data = value;
-                       }
+                       set { data = value; }
                }
 
-               [MonoTODO]
                public override string InnerText {
-                       get {
-                               throw new NotImplementedException ();
-                       }
+                       get { return data; }
 
-                       set {
-                               throw new NotImplementedException ();
-                       }
+                       set { data = value; }
                }
 
-               public int Length {
-                       get {
-                               return data != null ? data.Length : 0;
-                       }
+               public virtual int Length {
+                       get { return data != null ? data.Length : 0; }
                }
 
                public override string Value {
-                       get {
-                               return data;
-                       }
+                       get { return data; }
 
-                       set {
-                               data = value;
-                       }
+                       set { data = value; }
                }
 
                #endregion
@@ -91,10 +80,9 @@ namespace System.Xml
                        throw new NotImplementedException();
                }
 
-               [MonoTODO]
-               public virtual string Substring(int offset, int count)
+               public virtual string Substring (int offset, int count)
                {
-                       throw new NotImplementedException();
+                       return data.Substring (offset, count);
                }
 
                #endregion