X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.XML%2FSystem.Xml%2FXmlDocument.cs;h=1ba2d42e2d11d39f160a675cbb3dacc67a26e3cb;hb=3ffced165920cf94efc606d91ebcbe0d70c13aac;hp=67bd3eb03928bb9590f4de8e49d5611125be855d;hpb=66461e7b7a4292de076c82030d70ebe3e6b90f73;p=mono.git diff --git a/mcs/class/System.XML/System.Xml/XmlDocument.cs b/mcs/class/System.XML/System.Xml/XmlDocument.cs index 67bd3eb0392..1ba2d42e2d1 100644 --- a/mcs/class/System.XML/System.Xml/XmlDocument.cs +++ b/mcs/class/System.XML/System.Xml/XmlDocument.cs @@ -1,15 +1,23 @@ // // System.Xml.XmlDocument // -// Author: +// Authors: // Daniel Weber (daniel-weber@austin.rr.com) +// Kral Ferch +// Jason Diamond +// Miguel de Icaza (miguel@ximian.com) +// Duncan Mak (duncan@ximian.com) // // (C) 2001 Daniel Weber +// (C) 2002 Kral Ferch, Jason Diamond, Miguel de Icaza, Duncan Mak +// using System; using System.IO; +using System.Text; using System.Xml.XPath; using System.Diagnostics; +using System.Collections; namespace System.Xml { @@ -19,12 +27,31 @@ namespace System.Xml XmlLinkedNode lastLinkedChild; XmlNameTable nameTable; + string baseURI = String.Empty; #endregion #region Constructors - public XmlDocument () : base (null) { } + public XmlDocument () : base (null) + { + System.Xml.NameTable nt = new NameTable(); + // keys below are default of MS .NET Framework + nt.Add("#text"); + nt.Add("xml"); + nt.Add("xmlns"); + nt.Add("#entity"); + nt.Add("#document-fragment"); + nt.Add("#comment"); + nt.Add("space"); + nt.Add("id"); + nt.Add("#whitespace"); + nt.Add("http://www.w3.org/2000/xmlns/"); + nt.Add("#cdata-section"); + nt.Add("lang"); + + nameTable = nt; + } [MonoTODO] protected internal XmlDocument (XmlImplementation imp) : base (null) @@ -32,7 +59,7 @@ namespace System.Xml throw new NotImplementedException (); } - public XmlDocument (NameTable nt) : base (null) + public XmlDocument (XmlNameTable nt) : base (null) { nameTable = nt; } @@ -57,9 +84,10 @@ namespace System.Xml #region Properties - [MonoTODO] public override string BaseURI { - get { throw new NotImplementedException(); } + get { + return baseURI; + } } public XmlElement DocumentElement { @@ -86,9 +114,12 @@ namespace System.Xml get { throw new NotImplementedException(); } } - [MonoTODO] + [MonoTODO ("Setter.")] public override string InnerXml { - get { throw new NotImplementedException(); } + get { + // Not sure why this is an override. Passing through for now. + return base.InnerXml; + } set { throw new NotImplementedException(); } } @@ -133,7 +164,7 @@ namespace System.Xml } [MonoTODO] - public XmlResolver XmlResolver { + public virtual XmlResolver XmlResolver { set { throw new NotImplementedException(); } } @@ -147,36 +178,26 @@ namespace System.Xml throw new NotImplementedException (); } - [MonoTODO] public XmlAttribute CreateAttribute (string name) { - int indexOfColon = name.IndexOf (':'); - - if (indexOfColon == -1) - return CreateAttribute (String.Empty, name, String.Empty); - - string prefix = name.Substring (0, indexOfColon); - string localName = name.Substring (indexOfColon + 1); - - return CreateAttribute (prefix, localName, String.Empty); + return CreateAttribute (name, String.Empty); } - [MonoTODO] public XmlAttribute CreateAttribute (string qualifiedName, string namespaceURI) { - int indexOfColon = qualifiedName.IndexOf (':'); - - if (indexOfColon == -1) - return CreateAttribute (String.Empty, qualifiedName, String.Empty); + string prefix; + string localName; - string prefix = qualifiedName.Substring (0, indexOfColon); - string localName = qualifiedName.Substring (indexOfColon + 1); + ParseName (qualifiedName, out prefix, out localName); - return CreateAttribute (prefix, localName, String.Empty); + return CreateAttribute (prefix, localName, namespaceURI); } public virtual XmlAttribute CreateAttribute (string prefix, string localName, string namespaceURI) { + if ((localName == null) || (localName == String.Empty)) + throw new ArgumentException ("The attribute local name cannot be empty."); + return new XmlAttribute (prefix, localName, namespaceURI, this); } @@ -210,29 +231,17 @@ namespace System.Xml public XmlElement CreateElement (string name) { - int indexOfColon = name.IndexOf (':'); - - if (indexOfColon == -1) - return CreateElement (String.Empty, name, String.Empty); - - string prefix = name.Substring (0, indexOfColon); - string localName = name.Substring (indexOfColon + 1); - - return CreateElement (prefix, localName, String.Empty); + return CreateElement (name, String.Empty); } - [MonoTODO] public XmlElement CreateElement ( string qualifiedName, string namespaceURI) { - int indexOfColon = qualifiedName.IndexOf (':'); - - if (indexOfColon == -1) - return CreateElement (String.Empty, qualifiedName, namespaceURI); + string prefix; + string localName; - string prefix = qualifiedName.Substring (0, indexOfColon); - string localName = qualifiedName.Substring (indexOfColon + 1); + ParseName (qualifiedName, out prefix, out localName); return CreateElement (prefix, localName, namespaceURI); } @@ -242,7 +251,10 @@ namespace System.Xml string localName, string namespaceURI) { - return new XmlElement (prefix, localName, namespaceURI, this); + if ((localName == null) || (localName == String.Empty)) + throw new ArgumentException ("The local name for elements or attributes cannot be null or an empty string."); + + return new XmlElement (prefix != null ? prefix : String.Empty, localName, namespaceURI != null ? namespaceURI : String.Empty, this); } [MonoTODO] @@ -257,32 +269,51 @@ namespace System.Xml throw new NotImplementedException (); } - [MonoTODO] public virtual XmlNode CreateNode ( string nodeTypeString, string name, string namespaceURI) { - throw new NotImplementedException (); + return CreateNode (GetNodeTypeFromString (nodeTypeString), name, namespaceURI); } - [MonoTODO] public virtual XmlNode CreateNode ( XmlNodeType type, string name, string namespaceURI) { - throw new NotImplementedException (); + string prefix = null; + string localName = name; + + if ((type == XmlNodeType.Attribute) || (type == XmlNodeType.Element) || (type == XmlNodeType.EntityReference)) + ParseName (name, out prefix, out localName); + + return CreateNode (type, prefix, localName, namespaceURI); } - [MonoTODO] public virtual XmlNode CreateNode ( XmlNodeType type, string prefix, string name, string namespaceURI) { - throw new NotImplementedException (); + switch (type) { + case XmlNodeType.Attribute: return CreateAttribute (prefix, name, namespaceURI); + case XmlNodeType.CDATA: return CreateCDataSection (null); + case XmlNodeType.Comment: return CreateComment (null); + case XmlNodeType.Document: return new XmlDocument (); // TODO - test to see which constructor to use, i.e. use existing NameTable or not. + case XmlNodeType.DocumentFragment: return CreateDocumentFragment (); + case XmlNodeType.DocumentType: return CreateDocumentType (null, null, null, null); + case XmlNodeType.Element: return CreateElement (prefix, name, namespaceURI); + case XmlNodeType.EntityReference: return CreateEntityReference (null); + case XmlNodeType.ProcessingInstruction: return CreateProcessingInstruction (null, null); + case XmlNodeType.SignificantWhitespace: return CreateSignificantWhitespace (String.Empty); + case XmlNodeType.Text: return CreateTextNode (null); + case XmlNodeType.Whitespace: return CreateWhitespace (String.Empty); + case XmlNodeType.XmlDeclaration: return CreateXmlDeclaration ("1.0", null, null); + default: throw new ArgumentOutOfRangeException(String.Format("{0}\nParameter name: {1}", + "Specified argument was out of the range of valid values", type.ToString ())); + } } public virtual XmlProcessingInstruction CreateProcessingInstruction ( @@ -333,40 +364,177 @@ namespace System.Xml throw new NotImplementedException (); } - [MonoTODO] public virtual XmlNodeList GetElementsByTagName (string name) { - throw new NotImplementedException (); + ArrayList nodeArrayList = new ArrayList (); + this.searchNodesRecursively (this, name, nodeArrayList); + return new XmlNodeArrayList (nodeArrayList); + } + + private void searchNodesRecursively (XmlNode argNode, string argName, + ArrayList argArrayList) + { + XmlNodeList xmlNodeList = argNode.ChildNodes; + foreach (XmlNode node in xmlNodeList){ + if (node.Name.Equals (argName)) + argArrayList.Add (node); + else + this.searchNodesRecursively (node, argName, argArrayList); + } + } + + private void searchNodesRecursively (XmlNode argNode, string argName, string argNamespaceURI, + ArrayList argArrayList) + { + XmlNodeList xmlNodeList = argNode.ChildNodes; + foreach (XmlNode node in xmlNodeList){ + if (node.LocalName.Equals (argName) && node.NamespaceURI.Equals (argNamespaceURI)) + argArrayList.Add (node); + else + this.searchNodesRecursively (node, argName, argNamespaceURI, argArrayList); + } } - [MonoTODO] public virtual XmlNodeList GetElementsByTagName (string localName, string namespaceURI) { - throw new NotImplementedException(); + ArrayList nodeArrayList = new ArrayList (); + this.searchNodesRecursively (this, localName, namespaceURI, nodeArrayList); + return new XmlNodeArrayList (nodeArrayList); + } + + private XmlNodeType GetNodeTypeFromString (string nodeTypeString) + { + switch (nodeTypeString) { + case "attribute": return XmlNodeType.Attribute; + case "cdatasection": return XmlNodeType.CDATA; + case "comment": return XmlNodeType.Comment; + case "document": return XmlNodeType.Document; + case "documentfragment": return XmlNodeType.DocumentFragment; + case "documenttype": return XmlNodeType.DocumentType; + case "element": return XmlNodeType.Element; + case "entityreference": return XmlNodeType.EntityReference; + case "processinginstruction": return XmlNodeType.ProcessingInstruction; + case "significantwhitespace": return XmlNodeType.SignificantWhitespace; + case "text": return XmlNodeType.Text; + case "whitespace": return XmlNodeType.Whitespace; + default: + throw new ArgumentException(String.Format("The string doesn't represent any node type : {0}.", nodeTypeString)); + } } [MonoTODO] public virtual XmlNode ImportNode (XmlNode node, bool deep) { - throw new NotImplementedException (); + // How to resolve default attribute values? + switch(node.NodeType) + { + case XmlNodeType.Attribute: + { + XmlAttribute src_att = node as XmlAttribute; + XmlAttribute dst_att = this.CreateAttribute(src_att.Prefix, src_att.LocalName, src_att.NamespaceURI); + // TODO: resolve default attribute values + dst_att.Value = src_att.Value; + return dst_att; + } + + case XmlNodeType.CDATA: + return this.CreateCDataSection(node.Value); + + case XmlNodeType.Comment: + return this.CreateComment(node.Value); + + case XmlNodeType.Document: + throw new XmlException("Document cannot be imported."); + + case XmlNodeType.DocumentFragment: + { + XmlDocumentFragment df = this.CreateDocumentFragment(); + if(deep) + { + foreach(XmlNode n in node.ChildNodes) + { + df.AppendChild(this.ImportNode(n, deep)); + } + } + return df; + } + + case XmlNodeType.DocumentType: + throw new XmlException("DocumentType cannot be imported."); + + case XmlNodeType.Element: + { + XmlElement src = (XmlElement)node; + XmlElement dst = this.CreateElement(src.Prefix, src.LocalName, src.NamespaceURI); + foreach(XmlAttribute attr in src.Attributes) + { + // TODO: create default attribute values + dst.SetAttributeNode((XmlAttribute)this.ImportNode(attr, deep)); + } + if(deep) + { + foreach(XmlNode n in src.ChildNodes) + dst.AppendChild(this.ImportNode(n, deep)); + } + return dst; + } + + case XmlNodeType.EndElement: + throw new XmlException ("Illegal ImportNode call for NodeType.EndElement"); + case XmlNodeType.EndEntity: + throw new XmlException ("Illegal ImportNode call for NodeType.EndEntity"); + case XmlNodeType.Entity: + throw new NotImplementedException (); + + // [2002.10.14] CreateEntityReference not implemented. + case XmlNodeType.EntityReference: + throw new NotImplementedException("ImportNode of EntityReference not implemented mainly because CreateEntityReference was implemented in the meantime."); +// return this.CreateEntityReference(node.Name); + + case XmlNodeType.None: + throw new XmlException ("Illegal ImportNode call for NodeType.None"); + case XmlNodeType.Notation: + throw new NotImplementedException (); + + case XmlNodeType.ProcessingInstruction: + XmlProcessingInstruction pi = node as XmlProcessingInstruction; + return this.CreateProcessingInstruction(pi.Target, pi.Data); + + case XmlNodeType.SignificantWhitespace: + return this.CreateSignificantWhitespace(node.Value); + + case XmlNodeType.Text: + return this.CreateTextNode(node.Value); + + case XmlNodeType.Whitespace: + return this.CreateWhitespace(node.Value); + + // I don't know how to test it... + case XmlNodeType.XmlDeclaration: + // return this.CreateNode(XmlNodeType.XmlDeclaration, String.Empty, node.Value); + throw new NotImplementedException (); + + default: + throw new NotImplementedException (); + } } - [MonoTODO] public virtual void Load (Stream inStream) { - throw new NotImplementedException (); + XmlReader xmlReader = new XmlTextReader (inStream); + Load (xmlReader); } public virtual void Load (string filename) { + baseURI = filename; XmlReader xmlReader = new XmlTextReader (new StreamReader (filename)); Load (xmlReader); } - [MonoTODO] public virtual void Load (TextReader txtReader) { - throw new NotImplementedException (); + Load (new XmlTextReader (txtReader)); } public virtual void Load (XmlReader xmlReader) @@ -380,6 +548,10 @@ namespace System.Xml XmlNode currentNode = this; XmlNode newNode; +#if true + this.ConstructDOM(xmlReader, currentNode); +#else + // Below are copied to XmlNode.Construct(currentNode, xmlReader) while (xmlReader.Read ()) { switch (xmlReader.NodeType) { @@ -399,8 +571,11 @@ namespace System.Xml currentNode.AppendChild (element); // set the element's attributes. - while (xmlReader.MoveToNextAttribute ()) - element.SetAttribute (xmlReader.Name, xmlReader.Value); + while (xmlReader.MoveToNextAttribute ()) { + XmlAttribute attribute = CreateAttribute (xmlReader.Prefix, xmlReader.LocalName, xmlReader.NamespaceURI); + attribute.Value = xmlReader.Value; + element.SetAttributeNode (attribute); + } xmlReader.MoveToElement (); @@ -425,6 +600,7 @@ namespace System.Xml break; } } +#endif } public virtual void LoadXml (string xml) @@ -436,14 +612,14 @@ namespace System.Xml internal void onNodeChanged (XmlNode node, XmlNode Parent) { if (NodeChanged != null) - NodeInserted (node, new XmlNodeChangedEventArgs + NodeChanged (node, new XmlNodeChangedEventArgs (XmlNodeChangedAction.Change, node, Parent, Parent)); } internal void onNodeChanging(XmlNode node, XmlNode Parent) { - if (NodeInserting != null) + if (NodeChanging != null) NodeChanging (node, new XmlNodeChangedEventArgs (XmlNodeChangedAction.Change, node, Parent, Parent)); @@ -481,34 +657,57 @@ namespace System.Xml node, oldParent, null)); } + private void ParseName (string name, out string prefix, out string localName) + { + int indexOfColon = name.IndexOf (':'); + + if (indexOfColon != -1) { + prefix = name.Substring (0, indexOfColon); + localName = name.Substring (indexOfColon + 1); + } else { + prefix = ""; + localName = name; + } + } + [MonoTODO] public virtual XmlNode ReadNode(XmlReader reader) { throw new NotImplementedException (); } - [MonoTODO] + [MonoTODO ("Verify what encoding is used by default; Should use PreserveWhiteSpace")] public virtual void Save(Stream outStream) { - throw new NotImplementedException (); + XmlTextWriter xmlWriter = new XmlTextWriter (outStream, Encoding.UTF8); + WriteContentTo (xmlWriter); + xmlWriter.Close (); } - [MonoTODO] + [MonoTODO ("Verify what encoding is used by default; Should use PreseveWhiteSpace")] public virtual void Save (string filename) { - throw new NotImplementedException (); + XmlTextWriter xmlWriter = new XmlTextWriter (filename, Encoding.UTF8); + WriteContentTo (xmlWriter); + xmlWriter.Close (); } [MonoTODO] public virtual void Save (TextWriter writer) { - throw new NotImplementedException (); + XmlTextWriter xmlWriter = new XmlTextWriter (writer); + WriteContentTo (xmlWriter); + xmlWriter.Flush (); } - [MonoTODO] - public virtual void Save (XmlWriter writer) + [MonoTODO ("Should preserve white space if PreserveWhisspace is set")] + public virtual void Save (XmlWriter xmlWriter) { - throw new NotImplementedException (); + // + // This should preserve white space if PreserveWhiteSpace is true + // + WriteContentTo (xmlWriter); + xmlWriter.Flush (); } public override void WriteContentTo (XmlWriter w)