Nowadays, XmlDeclaratoin.WriteTo() writes PI instead of raw.

[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 a9fc7d267a6c9617a444f665d177d0eff8aa77d5..3623f1611319dfc579051d4a35a2906e76145c00 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlCharacterData.cs
+++ b/mcs/class/System.XML/System.Xml/XmlCharacterData.cs
@@ -8,7 +8,29 @@
 // (C) 2002 Jason Diamond, Kral Ferch
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
+using System.Xml.XPath;
 
 namespace System.Xml
 {
@@ -35,14 +57,12 @@ namespace System.Xml
                        get { return data; }
                        
                        set {
-                               OwnerDocument.onNodeChanging (this, this.ParentNode);
-
-                               if (IsReadOnly)
-                                       throw new ArgumentException ("Node is read-only.");
+                               string old = data;
+                               OwnerDocument.onNodeChanging (this, this.ParentNode, old, value);
 
                                data = value;
 
-                               OwnerDocument.onNodeChanged (this, this.ParentNode);
+                               OwnerDocument.onNodeChanged (this, this.ParentNode, old, value);
                        }
                }
 
@@ -64,21 +84,25 @@ namespace System.Xml
                        }
                }
 
+               internal override XPathNodeType XPathNodeType {
+                       get { return XPathNodeType.Text; }
+               }
+
                #endregion
 
                #region Methods
 
                public virtual void AppendData (string strData)
                {
-                       OwnerDocument.onNodeChanging (this, this.ParentNode);
-                       data += strData;
-                       OwnerDocument.onNodeChanged (this, this.ParentNode);
+                       string oldData = data;
+                       string newData = data += strData;
+                       OwnerDocument.onNodeChanging (this, this.ParentNode, oldData, newData);
+                       data = newData;
+                       OwnerDocument.onNodeChanged (this, this.ParentNode, oldData, newData);
                }
 
                public virtual void DeleteData (int offset, int count)
                {
-                       OwnerDocument.onNodeChanging (this, this.ParentNode);
-
                        if (offset < 0)
                                throw new ArgumentOutOfRangeException ("offset", "Must be non-negative and must not be greater than the length of this instance.");
 
@@ -87,48 +111,62 @@ namespace System.Xml
                        if ((offset + count) < data.Length)
                                newCount = count;
 
-                       data = data.Remove (offset, newCount);
+                       string oldValue = data;
+                       string newValue = data.Remove (offset, newCount);
+
+                       OwnerDocument.onNodeChanging (this, this.ParentNode, oldValue, newValue);
+
+                       data = newValue;
                        
-                       OwnerDocument.onNodeChanged (this, this.ParentNode);
+                       OwnerDocument.onNodeChanged (this, this.ParentNode, oldValue, newValue);
                }
 
                public virtual void InsertData (int offset, string strData)
                {
-                       OwnerDocument.onNodeChanging (this, this.ParentNode);
-
                        if ((offset < 0) || (offset > data.Length))
                                throw new ArgumentOutOfRangeException ("offset", "Must be non-negative and must not be greater than the length of this instance.");
 
-                       data = data.Insert(offset, strData);
+                       string oldData = data;
+                       string newData = data.Insert(offset, strData);
                        
-                       OwnerDocument.onNodeChanged (this, this.ParentNode);
+                       OwnerDocument.onNodeChanging (this, this.ParentNode, oldData, newData);
+
+                       data = newData;
+
+                       OwnerDocument.onNodeChanged (this, this.ParentNode, oldData, newData);
                }
 
                public virtual void ReplaceData (int offset, int count, string strData)
                {
-                       OwnerDocument.onNodeChanging (this, this.ParentNode);
-
                        if ((offset < 0) || (offset > data.Length))
                                throw new ArgumentOutOfRangeException ("offset", "Must be non-negative and must not be greater than the length of this instance.");
 
+                       if (count < 0)
+                               throw new ArgumentOutOfRangeException ("count", "Must be non-negative.");
+
                        if (strData == null)
                                throw new ArgumentNullException ("strData", "Must be non-null.");
 
+                       string oldData = data;
                        string newData = data.Substring (0, offset) + strData;
                        
                        if ((offset + count) < data.Length)
                                newData += data.Substring (offset + count);
 
+                       OwnerDocument.onNodeChanging (this, this.ParentNode, oldData, newData);
+
                        data = newData;
 
-                       OwnerDocument.onNodeChanged (this, this.ParentNode);
+                       OwnerDocument.onNodeChanged (this, this.ParentNode, oldData, newData);
                }
 
                public virtual string Substring (int offset, int count)
                {
-                       return data.Substring (offset, count);
+                       if (data.Length < offset + count)
+                               return data.Substring (offset);
+                       else
+                               return data.Substring (offset, count);
                }
-
                #endregion
        }
 }