From e47dababcf65e1a1807267acc3fe5458b879eb8d Mon Sep 17 00:00:00 2001 From: Duncan Mak Date: Tue, 23 Jul 2002 10:55:14 +0000 Subject: 2002-07-23 Duncan Mak * SoapFormatter.cs: This implements IFormatter and IRemoteFormatter. * XmlSchemaException.cs: Partiall implement the ISerializable methods. It's not clear now SourceSchemaObject should be deserialized. * XmlConvert.cs: Implement the ToDateTime method. ToDateTime (string, string []) is particularly strange. * XmlException.cs: Remember to call the base serialization constructor. * XmlNodeReader.cs: Keep a new variable to store the Depth. svn path=/trunk/mcs/; revision=6077 --- .../ChangeLog | 3 +++ .../SoapFormatter.cs | 5 ++++- mcs/class/System.XML/System.Xml.Schema/ChangeLog | 5 +++++ .../System.Xml.Schema/XmlSchemaException.cs | 21 +++++++++++++++++---- mcs/class/System.XML/System.Xml/ChangeLog | 10 ++++++++++ mcs/class/System.XML/System.Xml/XmlConvert.cs | 14 +++++++------- mcs/class/System.XML/System.Xml/XmlException.cs | 1 + mcs/class/System.XML/System.Xml/XmlNodeReader.cs | 5 +++-- mcs/class/corlib/System/SystemException.cs | 3 ++- 9 files changed, 52 insertions(+), 15 deletions(-) create mode 100644 mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog (limited to 'mcs/class') diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog new file mode 100644 index 00000000000..f32dea02e10 --- /dev/null +++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog @@ -0,0 +1,3 @@ +2002-07-23 Duncan Mak + + * SoapFormatter.cs: This implements IFormatter and IRemoteFormatter. diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs index 210589bc45f..b9028a0a223 100755 --- a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs +++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs @@ -8,11 +8,14 @@ using System; using System.Reflection; using System.Xml; using System.IO; +using System.Runtime.Remoting.Messaging; +using System.Runtime.Serialization; using System.Runtime.Serialization.Formatters; + namespace System.Runtime.Serialization.Formatters.soap { - public class SoapFormatter + public class SoapFormatter : IFormatter, IRemoteFormatter { private ObjectSerializer ObjSerializer; private ObjectDeserializer ObjDeserializer; diff --git a/mcs/class/System.XML/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/System.Xml.Schema/ChangeLog index a4b82f74201..13917ba73c5 100755 --- a/mcs/class/System.XML/System.Xml.Schema/ChangeLog +++ b/mcs/class/System.XML/System.Xml.Schema/ChangeLog @@ -1,3 +1,8 @@ +2002-07-23 Duncan Mak + + * XmlSchemaException.cs: Partiall implement the ISerializable + methods. It's not clear now SourceSchemaObject should be deserialized. + 2002-07-22 Tim Coleman * XmlSchema.cs: Removed isCompiled which is defined as internal in XmlSchemaObject. diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaException.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaException.cs index 4db03456847..af2e0276344 100755 --- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaException.cs +++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaException.cs @@ -18,8 +18,15 @@ namespace System.Xml.Schema private XmlSchemaObject sourceObj; private string sourceUri; - [MonoTODO] - protected XmlSchemaException(SerializationInfo info, StreamingContext context){} + [MonoTODO ("sourceObj needs to be serialized") + protected XmlSchemaException(SerializationInfo info, StreamingContext context) + : base (info, context) + { + this.lineNumber = info.GetInt32 ("lineNumber"); + this.linePosition = info.GetInt32 ("linePosition"); + this.sourceUri = info.GetString ("sourceUri"); + } + internal XmlSchemaException(string message, int lineNumber, int linePosition, XmlSchemaObject sourceObject, string sourceUri, Exception innerException) @@ -62,7 +69,13 @@ namespace System.Xml.Schema } // Methods - [MonoTODO] - public override void GetObjectData(SerializationInfo info, StreamingContext context){} + [MonoTODO ("sourceObj needs to be serialized") + public override void GetObjectData(SerializationInfo info, StreamingContext context) + { + base.GetObjectData (info, context); + info.AddValue ("lineNumber", lineNumber); + info.AddValue ("linePosition", linePosition); + info.AddValue ("SourceUri", sourceUri); + } } } diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index a1272241e7c..661fcb3cbdc 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,3 +1,13 @@ +2002-07-23 Duncan Mak + + * XmlConvert.cs: Implement the ToDateTime method. ToDateTime + (string, string []) is particularly strange. + + * XmlException.cs: Remember to call the base serialization + constructor. + + * XmlNodeReader.cs: Keep a new variable to store the Depth. + 2002-07-14 Jason Diamond * XmlAttribute.cs: Removed ownerElement field since we can reuse diff --git a/mcs/class/System.XML/System.Xml/XmlConvert.cs b/mcs/class/System.XML/System.Xml/XmlConvert.cs index 5db6afcfe87..5c3e278b9b4 100755 --- a/mcs/class/System.XML/System.Xml/XmlConvert.cs +++ b/mcs/class/System.XML/System.Xml/XmlConvert.cs @@ -60,25 +60,25 @@ namespace System.Xml { public static char ToChar(string s) { - return char.Parse(s); + return Char.Parse(s); } - [MonoTODO] public static DateTime ToDateTime(string s) { - throw new NotImplementedException(); + return DateTime.Parse(s); } - [MonoTODO] public static DateTime ToDateTime(string s, string format) { - throw new NotImplementedException(); + DateTimeFormatInfo d = new DateTimeFormatInfo(); + d.FullDateTimePattern = format; + return DateTime.Parse(s, d); } - + [MonoTODO] public static DateTime ToDateTime(string s, string[] formats) { - throw new NotImplementedException(); + return DateTime.Parse(s); } public static Decimal ToDecimal(string s) diff --git a/mcs/class/System.XML/System.Xml/XmlException.cs b/mcs/class/System.XML/System.Xml/XmlException.cs index a9e291fbe93..f6efec719ad 100755 --- a/mcs/class/System.XML/System.Xml/XmlException.cs +++ b/mcs/class/System.XML/System.Xml/XmlException.cs @@ -32,6 +32,7 @@ namespace System.Xml } protected XmlException (SerializationInfo info, StreamingContext context) + : base (info, context) { this.lineNumber = info.GetInt32 ("lineNumber"); this.linePosition = info.GetInt32 ("linePosition"); diff --git a/mcs/class/System.XML/System.Xml/XmlNodeReader.cs b/mcs/class/System.XML/System.Xml/XmlNodeReader.cs index 8bfd1013ad7..b05a2e1814e 100755 --- a/mcs/class/System.XML/System.Xml/XmlNodeReader.cs +++ b/mcs/class/System.XML/System.Xml/XmlNodeReader.cs @@ -19,6 +19,7 @@ namespace System.Xml XmlNode current; ReadState state = ReadState.Initial; + int depth; public XmlNodeReader (XmlNode node) { @@ -43,9 +44,8 @@ namespace System.Xml get { return false; } } - [MonoTODO] public override int Depth { - get { return 0; } + get { return depth; } } [MonoTODO] @@ -88,6 +88,7 @@ namespace System.Xml } } + [MonoTODO] public override bool IsEmptyElement { get { if (current.NodeType == XmlNodeType.Entity && diff --git a/mcs/class/corlib/System/SystemException.cs b/mcs/class/corlib/System/SystemException.cs index 7e41953645f..39a4f411296 100644 --- a/mcs/class/corlib/System/SystemException.cs +++ b/mcs/class/corlib/System/SystemException.cs @@ -27,7 +27,8 @@ namespace System { } protected SystemException(SerializationInfo info, StreamingContext context) - : base (info, context) { + : base (info, context) + { } public SystemException (string message, Exception inner) -- cgit v1.2.3