2005-02-03 Atsushi Enomoto <atsushi@ximian.com>

	* DataViewManager.cs: misuse of ReadStartElement(string).
	* DataRowView.cs : removed some MonoTODO.

svn path=/trunk/mcs/; revision=40049

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index ca8fc6a8c5f31694831f994b2adbeb3f1dfd2ab1..2eeaeac257635b871343f0037b5bde8015695717 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-03  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * DataViewManager.cs: misuse of ReadStartElement(string).
+       * DataRowView.cs : removed some MonoTODO.
+
 2005-02-02  Sureshkumar T  <tsureshkumar@novell.com>
            Ankit Jain     <radical@corewars.org>
 

diff --git a/mcs/class/System.Data/System.Data/DataRowView.cs b/mcs/class/System.Data/System.Data/DataRowView.cs
index 1c6bde071bc0f729552f52efb75533b24154acfd..c7b09055a2e6bfd19ccd97df831ea89f7ad53ed5 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataRowView.cs
+++ b/mcs/class/System.Data/System.Data/DataRowView.cs
@@ -102,7 +102,6 @@ namespace System.Data
                                dataRow.Table.ChildRelations [name]);
                }
 
-               [MonoTODO]
                public void Delete ()
                {
                        dataView.DeleteRowView (this);
@@ -137,12 +136,10 @@ namespace System.Data
                
                [System.Runtime.CompilerServices.IndexerName("Item")]
                public object this[string column] {
-                       [MonoTODO]
                        get {
                                DataColumn dc = dataView.Table.Columns[column];
                                return dataRow[dc];
                        }
-                       [MonoTODO]
                        set {
                                DataColumn dc = dataView.Table.Columns[column];
                                dataRow[dc] = value;
@@ -152,12 +149,10 @@ namespace System.Data
                // the compiler creates a DefaultMemeberAttribute from
                // this IndexerNameAttribute
                public object this[int column] {
-                       [MonoTODO]
                        get {
                                DataColumn dc = dataView.Table.Columns[column];
                                return dataRow[dc];
                        }
-                       [MonoTODO]
                        set {
                                DataColumn dc = dataView.Table.Columns[column];
                                dataRow[dc] = value;

diff --git a/mcs/class/System.Data/System.Data/DataViewManager.cs b/mcs/class/System.Data/System.Data/DataViewManager.cs
index d9924a42751d853cea8bf543023cd421ee12d00f..60dd0b0d0e93113f77a87644259fb0856441e445 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataViewManager.cs
+++ b/mcs/class/System.Data/System.Data/DataViewManager.cs
@@ -197,7 +197,10 @@ namespace System.Data
                        XmlTextReader xtr = new XmlTextReader (source,
                                XmlNodeType.Element, null);
 
-                       xtr.ReadStartElement ("DataViewSettingCollectionString");
+                       xtr.Read ();
+                       if (xtr.Name != "DataViewSettingCollectionString")
+                               // easy way to throw the expected exception ;-)
+                               xtr.ReadStartElement ("DataViewSettingCollectionString");
                        if (xtr.IsEmptyElement)
                                return; // MS does not change the value.