* 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

diff --git a/mcs/class/System.Data/System.Data.Common/ChangeLog b/mcs/class/System.Data/System.Data.Common/ChangeLog
index 5af49a6b2f7861762780053d504f485e9f421323..a342bb057f0c1bc193c676e6c025a19a52a655ae 100755 (executable)
--- 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  <duncan@ximian.com>
+
+       * DataAdapter.cs (CloneInternals): Mark with ObsoleteAttribute for
+       NET_1_1.
+
 2003-03-21  Alan Tam <Tam@SiuLung.com>
 
        * 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 9b507ea0fda169eb3f0e9f90e646d91e9678bebf..c6b75964434551b5cf633c408d0e92775a3e3375 100644 (file)
--- 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 7b26748346c926fb1f37c890afb9b1604a603a70..f20637c185579848f90338f453313ce134d97dc7 100644 (file)
--- 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  <duncan@ximian.com>
+
+       * DBConcurrencyException.cs: Added new NET_1_1 no-param constructor.
+
 2003-07-25  Ravi Pratap  <ravi@ximian.com>
 
        * 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 0d5247f52915f47491a3816b5f75603bca5e3ea7..22dc144e58cac703773d26d2a0c3bdd6fcc2d577 100644 (file)
--- 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 597f102b04b7fefbc2998936d1704512c9a07474..ebace89286629ff7cf507527c92b087c2d795105 100644 (file)
--- 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  <duncan@ximian.com>
+
+       * 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 <Tam@SiuLung.com>
 
        * 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 a45d2a45eb82b5f2f80077c22cca509cf7395ff6..20e35df0299ddf55d8d40f1038e8ac30a683c683 100644 (file)
--- 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