Author: atsushi
Date: 2007-12-05 08:02:30 -0500 (Wed, 05 Dec 2007)
New Revision: 90753

Modified:
   
trunk/olive/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog
   
trunk/olive/class/System.Runtime.Serialization/System.Runtime.Serialization/DataContractSerializer.cs
   
trunk/olive/class/System.Runtime.Serialization/System.Runtime.Serialization/XmlObjectSerializer.cs
   
trunk/olive/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/ChangeLog
   
trunk/olive/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs
Log:
2007-12-05  Atsushi Enomoto  <[EMAIL PROTECTED]>

        * XmlObjectSerializer.cs : some methods became virtual (in Redbits).
        * DataContractSerializer.cs : added some overriden methods in Redbits.
          knownTypes can be null in .ctor().

        * XmlObjectSerializerTest.cs : test for .ctor() with null knownTypes.



Modified: 
trunk/olive/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog
===================================================================
--- 
trunk/olive/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog
       2007-12-05 11:43:37 UTC (rev 90752)
+++ 
trunk/olive/class/System.Runtime.Serialization/System.Runtime.Serialization/ChangeLog
       2007-12-05 13:02:30 UTC (rev 90753)
@@ -1,3 +1,9 @@
+2007-12-05  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * XmlObjectSerializer.cs : some methods became virtual (in Redbits).
+       * DataContractSerializer.cs : added some overriden methods in Redbits.
+         knownTypes can be null in .ctor().
+
 2007-08-17  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * SerializationMap.cs : for void it cannot be instantiated. Return

Modified: 
trunk/olive/class/System.Runtime.Serialization/System.Runtime.Serialization/DataContractSerializer.cs
===================================================================
--- 
trunk/olive/class/System.Runtime.Serialization/System.Runtime.Serialization/DataContractSerializer.cs
       2007-12-05 11:43:37 UTC (rev 90752)
+++ 
trunk/olive/class/System.Runtime.Serialization/System.Runtime.Serialization/DataContractSerializer.cs
       2007-12-05 13:02:30 UTC (rev 90753)
@@ -4,7 +4,7 @@
 // Author:
 //     Atsushi Enomoto <[EMAIL PROTECTED]>
 //
-// Copyright (C) 2005 Novell, Inc.  http://www.novell.com
+// Copyright (C) 2005-2007 Novell, Inc.  http://www.novell.com
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -113,8 +113,6 @@
                {
                        if (type == null)
                                throw new ArgumentNullException ("type");
-                       if (knownTypes == null)
-                               throw new ArgumentNullException ("knownTypes");
                        if (rootName == null)
                                throw new ArgumentNullException ("rootName");
                        if (rootNamespace == null)
@@ -248,6 +246,18 @@
                        throw new NotImplementedException ();
                }
 
+               // SP1
+               public override bool IsStartObject (XmlReader reader)
+               {
+                       return IsStartObject 
(XmlDictionaryReader.CreateDictionaryReader (reader));
+               }
+
+               // SP1
+               public override object ReadObject (XmlReader reader)
+               {
+                       return ReadObject 
(XmlDictionaryReader.CreateDictionaryReader (reader));
+               }
+
                [MonoTODO]
                public override object ReadObject (XmlDictionaryReader reader, 
bool verifyObjectName)
                {
@@ -282,6 +292,13 @@
                        reader.Read ();
                }
 
+               // SP1
+               public override void WriteObject (XmlWriter writer, object 
graph)
+               {
+                       XmlDictionaryWriter w = 
XmlDictionaryWriter.CreateDictionaryWriter (writer);
+                       WriteObject (w, graph);
+               }
+
                [MonoTODO ("support arrays; support Serializable; support 
SharedType; use DataContractSurrogate")]
                /*
                        when writeContentOnly is true, then the input XmlWriter
@@ -312,7 +329,14 @@
                                known_types.RemoveAt (startTypeCount);
                }
 
+               // SP1
                public override void WriteStartObject (
+                       XmlWriter writer, object graph)
+               {
+                       WriteStartObject 
(XmlDictionaryWriter.CreateDictionaryWriter (writer), graph);
+               }
+
+               public override void WriteStartObject (
                        XmlDictionaryWriter writer, object graph)
                {
                        Type rootType = type;
@@ -370,6 +394,12 @@
                {
                        writer.WriteEndElement ();
                }
+
+               // SP1
+               public override void WriteEndObject (XmlWriter writer)
+               {
+                       WriteEndObject 
(XmlDictionaryWriter.CreateDictionaryWriter (writer));
+               }
        }
 }
 #endif

Modified: 
trunk/olive/class/System.Runtime.Serialization/System.Runtime.Serialization/XmlObjectSerializer.cs
===================================================================
--- 
trunk/olive/class/System.Runtime.Serialization/System.Runtime.Serialization/XmlObjectSerializer.cs
  2007-12-05 11:43:37 UTC (rev 90752)
+++ 
trunk/olive/class/System.Runtime.Serialization/System.Runtime.Serialization/XmlObjectSerializer.cs
  2007-12-05 13:02:30 UTC (rev 90753)
@@ -62,7 +62,7 @@
 
                public abstract bool IsStartObject (XmlDictionaryReader reader);
 
-               public object ReadObject (Stream stream)
+               public virtual object ReadObject (Stream stream)
                {
                        return ReadObject (XmlReader.Create (stream));
                }
@@ -87,7 +87,7 @@
                [MonoTODO]
                public abstract object ReadObject (XmlDictionaryReader reader, 
bool readContentOnly);
 
-               public void WriteObject (Stream stream, object graph)
+               public virtual void WriteObject (Stream stream, object graph)
                {
                        WriteObject (XmlWriter.Create (stream), graph);
                }

Modified: 
trunk/olive/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/ChangeLog
===================================================================
--- 
trunk/olive/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/ChangeLog
  2007-12-05 11:43:37 UTC (rev 90752)
+++ 
trunk/olive/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/ChangeLog
  2007-12-05 13:02:30 UTC (rev 90753)
@@ -1,3 +1,7 @@
+2007-12-05  Atsushi Enomoto  <[EMAIL PROTECTED]>
+
+       * XmlObjectSerializerTest.cs : test for .ctor() with null knownTypes.
+
 2007-11-27  Atsushi Enomoto  <[EMAIL PROTECTED]>
 
        * XmlObjectSerializerTest.cs, XsdDataContractImporterTest.cs:

Modified: 
trunk/olive/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs
===================================================================
--- 
trunk/olive/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs
 2007-12-05 11:43:37 UTC (rev 90752)
+++ 
trunk/olive/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs
 2007-12-05 13:02:30 UTC (rev 90753)
@@ -76,6 +76,7 @@
                        // null knownTypes is allowed.
                        new DataContractSerializer (typeof (Sample1), null);
                        new DataContractSerializer (typeof (Sample1), "Foo", 
String.Empty, null);
+                       new DataContractSerializer (typeof (Sample1), new 
XmlDictionary ().Add ("Foo"), XmlDictionaryString.Empty, null);
                }
 
                [Test]

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to