Merge pull request #103 from XTZGZoReX/master
[mono.git] / mcs / class / System.XML / System.Xml.Serialization / XmlSerializationWriter.cs
index 522314608f386cb8181de34cd72a412172a63c13..890d22022d9c65b8267d1676f96756e8ae277d19 100644 (file)
@@ -31,6 +31,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
 using System.Xml;
@@ -54,7 +55,11 @@ namespace System.Xml.Serialization
 
                ArrayList namespaces;
                XmlWriter writer;
+#if MOONLIGHT
+               Queue<object> referencedElements;
+#else
                Queue referencedElements;
+#endif
                Hashtable callbacks;
                Hashtable serializedObjects;
                const string xmlNamespace = "http://www.w3.org/2000/xmlns/";
@@ -87,10 +92,17 @@ namespace System.Xml.Serialization
 
                #region Properties
 
+#if MOONLIGHT
+               protected IList XmlNamespaces {
+                       get { return namespaces; }
+                       set { namespaces = (value as ArrayList); }
+               }
+#else
                protected ArrayList Namespaces {
                        get { return namespaces; }
                        set { namespaces = value; }
                }
+#endif
 
                protected XmlWriter Writer {
                        get { return writer; }
@@ -297,6 +309,15 @@ namespace System.Xml.Serialization
                        Writer.WriteAttributeString (prefix, localName, ns, value);
                }
 
+#if !MOONLIGHT
+               void WriteXmlNode (XmlNode node)
+               {
+                       if (node is XmlDocument)
+                               node = ((XmlDocument) node).DocumentElement;
+
+                       node.WriteTo (Writer);
+               }
+
                protected void WriteElementEncoded (XmlNode node, string name, string ns, bool isNullable, bool any)
                {
                        if (name != string.Empty)
@@ -309,12 +330,12 @@ namespace System.Xml.Serialization
                                else
                                {
                                        Writer.WriteStartElement (name, ns);
-                                       node.WriteTo (Writer);
+                                       WriteXmlNode (node);
                                        Writer.WriteEndElement ();
                                }
                        }
                        else
-                               node.WriteTo (Writer);
+                               WriteXmlNode(node);
                }
 
                protected void WriteElementLiteral (XmlNode node, string name, string ns, bool isNullable, bool any)
@@ -329,13 +350,14 @@ namespace System.Xml.Serialization
                                else
                                {
                                        Writer.WriteStartElement (name, ns);
-                                       node.WriteTo (Writer);
+                                       WriteXmlNode (node);
                                        Writer.WriteEndElement ();
                                }
                        }
                        else
-                               node.WriteTo (Writer);
+                               WriteXmlNode (node);
                }
+#endif
 
                protected void WriteElementQualifiedName (string localName, XmlQualifiedName value)
                {
@@ -482,8 +504,11 @@ namespace System.Xml.Serialization
                {
                        if (ns == null)
                                return;
-
+#if MOONLIGHT
+                       IEnumerable<XmlQualifiedName> namespaces = ns.GetNamespaces ();
+#else
                        ICollection namespaces = ns.Namespaces.Values;
+#endif
                        foreach (XmlQualifiedName qn in namespaces) {
                                if (qn.Namespace != String.Empty && Writer.LookupPrefix (qn.Namespace) != qn.Name)
                                        WriteAttribute ("xmlns", qn.Name, xmlNamespace, qn.Namespace);
@@ -609,7 +634,7 @@ namespace System.Xml.Serialization
 
                        CheckReferenceQueue ();
 
-                       if (callbacks.ContainsKey (o.GetType ()))
+                       if (callbacks != null && callbacks.ContainsKey (o.GetType ()))
                        {
                                WriteCallbackInfo info = (WriteCallbackInfo) callbacks[o.GetType()];
                                if (o.GetType ().IsEnum) {
@@ -735,7 +760,11 @@ namespace System.Xml.Serialization
                {
                        if (referencedElements == null)  
                        {
+#if MOONLIGHT
+                               referencedElements = new Queue<object> ();
+#else
                                referencedElements = new Queue ();
+#endif
                                InitCallbacks ();
                        }
                }
@@ -747,17 +776,27 @@ namespace System.Xml.Serialization
                }
 
                protected void WriteSerializable (IXmlSerializable serializable, string name, string ns, bool isNullable)
+               {
+                       WriteSerializable (serializable, name, ns, isNullable, true);
+               }
+
+#if NET_2_0
+               protected
+#endif
+               void WriteSerializable (IXmlSerializable serializable, string name, string ns, bool isNullable, bool wrapped)
                {
                        if (serializable == null)
                        {
-                               if (isNullable) WriteNullTagLiteral (name, ns);
+                               if (isNullable && wrapped) WriteNullTagLiteral (name, ns);
                                return;
                        }
                        else
                        {
-                               Writer.WriteStartElement (name, ns);
+                               if (wrapped)
+                                       Writer.WriteStartElement (name, ns);
                                serializable.WriteXml (Writer);
-                               Writer.WriteEndElement ();
+                               if (wrapped)
+                                       Writer.WriteEndElement ();
                        }
                }
 
@@ -788,6 +827,18 @@ namespace System.Xml.Serialization
                }
 
                protected void WriteStartElement (string name, string ns, object o, bool writePrefixed)
+               {
+                       WriteStartElement (name, ns, o, writePrefixed, namespaces);
+               }
+
+#if NET_2_0
+               protected void WriteStartElement (string name, string ns, Object o, bool writePrefixed, XmlSerializerNamespaces xmlns)
+               {
+                       WriteStartElement (name, ns, o, writePrefixed, xmlns != null ? xmlns.ToArray () : null);
+               }
+#endif
+
+               void WriteStartElement (string name, string ns, object o, bool writePrefixed, ICollection namespaces)
                {
                        if (o != null)
                        {
@@ -801,12 +852,13 @@ namespace System.Xml.Serialization
                        
                        if (topLevelElement && ns != null && ns.Length != 0)
                        {
-                               foreach (XmlQualifiedName qn in namespaces)
-                                       if (qn.Namespace == ns) {
-                                               prefix = qn.Name;
-                                               writePrefixed = true;
-                                               break;
-                                       }
+                               if (namespaces != null)
+                                       foreach (XmlQualifiedName qn in namespaces)
+                                               if (qn.Namespace == ns) {
+                                                       prefix = qn.Name;
+                                                       writePrefixed = true;
+                                                       break;
+                                               }
                        }
 
                        if (writePrefixed && ns != string.Empty)
@@ -840,29 +892,31 @@ namespace System.Xml.Serialization
                {
                        string value;
                        TypeData td = TypeTranslator.GetTypeData (o.GetType ());
+                       if (td.SchemaType != SchemaTypes.Primitive)
+                               throw new InvalidOperationException (String.Format ("The type of the argument object '{0}' is not primitive.", td.FullTypeName));
 
-                       name = XmlCustomFormatter.FromXmlName (name);
+                       if (name == null) {
+                               ns = td.IsXsdType ? XmlSchema.Namespace : XmlSerializer.WsdlTypesNamespace;
+                               name = td.XmlType;
+                       }
+                       else
+                               name = XmlCustomFormatter.FromXmlName (name);
                        Writer.WriteStartElement (name, ns);
 
-                       if (o is XmlNode[]) {
-                               foreach (XmlNode node in (XmlNode[])o)
-                                       node.WriteTo (Writer);
+                       if (o is XmlQualifiedName)
+                               value = FromXmlQualifiedName ((XmlQualifiedName) o);
+                       else
+                               value = XmlCustomFormatter.ToXmlString (td, o);
+
+                       if (xsiType)
+                       {
+                               if (td.SchemaType != SchemaTypes.Primitive)
+                                       throw new InvalidOperationException (string.Format (unexpectedTypeError, o.GetType().FullName));
+                               WriteXsiType (td.XmlType, td.IsXsdType ? XmlSchema.Namespace : XmlSerializer.WsdlTypesNamespace);
                        }
-                       else {
-                               if (o is XmlQualifiedName)
-                                       value = FromXmlQualifiedName ((XmlQualifiedName) o);
-                               else
-                                       value = XmlCustomFormatter.ToXmlString (td, o);
 
-                               if (xsiType)
-                               {
-                                       if (td.SchemaType != SchemaTypes.Primitive)
-                                               throw new InvalidOperationException (string.Format (unexpectedTypeError, o.GetType().FullName));
-                                       WriteXsiType (td.XmlType, XmlSchema.Namespace);
-                               }
+                       WriteValue (value);
 
-                               WriteValue (value);
-                       }
                        Writer.WriteEndElement ();
                }
 
@@ -877,6 +931,7 @@ namespace System.Xml.Serialization
                                Writer.WriteString (value);
                }
 
+#if !MOONLIGHT
                protected void WriteXmlAttribute (XmlNode node)
                {
                        WriteXmlAttribute (node, null);
@@ -902,6 +957,7 @@ namespace System.Xml.Serialization
                        
                        WriteAttribute (attr.Prefix, attr.LocalName, attr.NamespaceURI, attr.Value);
                }
+#endif
 
                protected void WriteXsiType (string name, string ns)
                {
@@ -913,16 +969,17 @@ namespace System.Xml.Serialization
                
 #if NET_2_0
 
-               [MonoTODO]
                protected Exception CreateInvalidAnyTypeException (object o)
                {
-                       throw new NotImplementedException ();
+                       if (o == null)
+                               return new InvalidOperationException ("null is invalid as anyType in XmlSerializer");
+                       else
+                               return CreateInvalidAnyTypeException (o.GetType ());
                }
                
-               [MonoTODO]
                protected Exception CreateInvalidAnyTypeException (Type t)
                {
-                       throw new NotImplementedException ();
+                       return new InvalidOperationException (String.Format ("An object of type '{0}' is invalid as anyType in XmlSerializer", t));
                }
 
                protected Exception CreateInvalidEnumValueException (object value, string typeName)
@@ -948,12 +1005,6 @@ namespace System.Xml.Serialization
                        throw new NotImplementedException ();
                }
                
-               [MonoTODO]
-               protected void WriteSerializable (IXmlSerializable serializable, string name, string ns, bool isNullable, bool any)
-               {
-                       throw new NotImplementedException ();
-               }
-               
                [MonoTODO]
                protected bool EscapeName
                {