From 8ce905380e2178f964238200a0c39653b74c2296 Mon Sep 17 00:00:00 2001 From: Duncan Mak Date: Thu, 31 Jul 2003 23:24:36 +0000 Subject: [PATCH 1/1] * DataAdapter.cs (CloneInternals): Mark with ObsoleteAttribute for NET_1_1. * DBConcurrencyException.cs: Added new NET_1_1 no-param constructor. * XmlDataDocument.cs (BaseURI): (InnerXml): (IsReadOnly): (this): (LocalName): (Name): (OwnerDocument): (WriteContentTo): (WriteTo): Removed, these do not need to be redefined, as they are inherited from XmlDocument already. svn path=/trunk/mcs/; revision=16966 --- .../System.Data/System.Data.Common/ChangeLog | 5 ++ .../System.Data.Common/DataAdapter.cs | 5 +- mcs/class/System.Data/System.Data/ChangeLog | 4 + .../System.Data/DBConcurrencyException.cs | 7 ++ mcs/class/System.Data/System.Xml/ChangeLog | 17 ++++ .../System.Data/System.Xml/XmlDataDocument.cs | 87 +------------------ 6 files changed, 40 insertions(+), 85 deletions(-) diff --git a/mcs/class/System.Data/System.Data.Common/ChangeLog b/mcs/class/System.Data/System.Data.Common/ChangeLog index 5af49a6b2f7..a342bb057f0 100755 --- a/mcs/class/System.Data/System.Data.Common/ChangeLog +++ b/mcs/class/System.Data/System.Data.Common/ChangeLog @@ -1,3 +1,8 @@ +2003-07-31 Duncan Mak + + * DataAdapter.cs (CloneInternals): Mark with ObsoleteAttribute for + NET_1_1. + 2003-03-21 Alan Tam * DbDataAdapter.cs: Update now uses correct DataRowVersion diff --git a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs index 9b507ea0fda..c6b75964434 100644 --- a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs +++ b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs @@ -91,7 +91,10 @@ namespace System.Data.Common #region Methods - [MonoTODO] +#if NET_1_1 + [Obsolete ("Use the protected constructor instead", false)] +#endif + [MonoTODO] protected virtual DataAdapter CloneInternals () { throw new NotImplementedException (); diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog index 7b26748346c..f20637c1855 100644 --- a/mcs/class/System.Data/System.Data/ChangeLog +++ b/mcs/class/System.Data/System.Data/ChangeLog @@ -1,3 +1,7 @@ +2003-07-31 Duncan Mak + + * DBConcurrencyException.cs: Added new NET_1_1 no-param constructor. + 2003-07-25 Ravi Pratap * DataRelation.cs (OnPropertyChanging): Calling the 'Invoke' diff --git a/mcs/class/System.Data/System.Data/DBConcurrencyException.cs b/mcs/class/System.Data/System.Data/DBConcurrencyException.cs index 0d5247f5291..22dc144e58c 100644 --- a/mcs/class/System.Data/System.Data/DBConcurrencyException.cs +++ b/mcs/class/System.Data/System.Data/DBConcurrencyException.cs @@ -13,6 +13,13 @@ namespace System.Data { [Serializable] public sealed class DBConcurrencyException : SystemException { + +#if NET_1_1 + public DBConcurrencyException () + : base () + { + } +#endif public DBConcurrencyException (string message) : base (message) { diff --git a/mcs/class/System.Data/System.Xml/ChangeLog b/mcs/class/System.Data/System.Xml/ChangeLog index 597f102b04b..ebace892866 100644 --- a/mcs/class/System.Data/System.Xml/ChangeLog +++ b/mcs/class/System.Data/System.Xml/ChangeLog @@ -1,3 +1,20 @@ +2003-07-31 Duncan Mak + + * XmlDataDocument.cs (BaseURI): + (InnerXml): + (IsReadOnly): + (this): + (LocalName): + (Name): + (OwnerDocument): + (WriteContentTo): + (WriteTo): Removed, these do not need to be redefined, as + they are inherited from XmlDocument already. + + (CreateElement): simplifed the + implementation. XmlDocument.CreateElement can handle String.Empty + and null just fine. + 2003-03-12 Alan Tam * XmlDataDocument.cs: Still need to print tag for the DataSet if there diff --git a/mcs/class/System.Data/System.Xml/XmlDataDocument.cs b/mcs/class/System.Data/System.Xml/XmlDataDocument.cs index a45d2a45eb8..20e35df0299 100644 --- a/mcs/class/System.Data/System.Xml/XmlDataDocument.cs +++ b/mcs/class/System.Data/System.Xml/XmlDataDocument.cs @@ -122,77 +122,12 @@ namespace System.Xml { #region Public Properties - public override string BaseURI { - [MonoTODO] - get { - // TODO: why are we overriding? - return base.BaseURI; - } - } - public DataSet DataSet { get { return dataSet; } } - // override inheritted method from XmlDocument - public override string InnerXml { - [MonoTODO("override???")] - get { - return base.InnerXml; - } - - [MonoTODO] - set { - base.InnerXml = value; - } - } - - public override bool IsReadOnly { - [MonoTODO("override???")] - get { - return isReadOnly; - } - - } - - // Item indexer - public override XmlElement this[string name] { - [MonoTODO("override???")] - get { - return base [name]; - } - } - - // Item indexer - public override XmlElement this[string localname, string ns] { - [MonoTODO("override???")] - get { - return base [localname, ns]; - } - } - - public override string LocalName { - [MonoTODO("override???")] - get { - return base.LocalName; - } - } - - public override string Name { - [MonoTODO("override??")] - get { - return base.Name; - } - } - - public override XmlDocument OwnerDocument { - get { - return null; - } - } - #endregion // Public Properties #region Public Methods @@ -221,15 +156,10 @@ namespace System.Xml { #region overloaded CreateElement methods - [MonoTODO ("why this is override?")] - public override XmlElement CreateElement(string prefix, - string localName, string namespaceURI) + public override XmlElement CreateElement( + string prefix, string localName, string namespaceURI) { - if ((localName == null) || (localName == String.Empty)) - throw new ArgumentException ("The local name for elements or attributes cannot be null" + - "or an empty string."); - string pref = prefix != null ? prefix : String.Empty; - return base.CreateElement (pref, localName, namespaceURI != null ? namespaceURI : String.Empty); + return base.CreateElement (prefix, localName, namespaceURI); } #endregion // overloaded CreateElement Methods @@ -401,17 +331,6 @@ namespace System.Xml { } #endregion // overloaded Load methods - - [MonoTODO] - public override void WriteContentTo(XmlWriter xw) { - base.WriteContentTo (xw); - } - - [MonoTODO] - public override void WriteTo(XmlWriter w) { - base.WriteTo (w); - } - #endregion // Public Methods #region Protected Methods -- 2.25.1