*** empty log message ***

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

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index 26d6bc55af56692264969d3957ad6377986111be..6f2febc43ab0e3bdaa66fce3a01f0666dbbd86de 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-18  Gert Driesen <drieseng@users.sourceforge.net>
+
+        * DataViewSetting.cs: renamed fields to match MS.NET
+
+2004-06-18  Gert Driesen <drieseng@users.sourceforge.net>
+
+        * DBConcurrencyException.cs: fixed serialization compatibility with
+        MS.NET
+
 2004-06-17  Boris Kirzner  <borisk@mainsoft.com>
 
        * ChangeLog : Fix for misspelled words.

diff --git a/mcs/class/System.Data/System.Data/DBConcurrencyException.cs b/mcs/class/System.Data/System.Data/DBConcurrencyException.cs
index 701c92a35df14ec8c1ac7dbf0a57dc0d932a9417..5a5af4eb0e41ef518f84a012f99ddc29707fa6fd 100644 (file)
--- a/mcs/class/System.Data/System.Data/DBConcurrencyException.cs
+++ b/mcs/class/System.Data/System.Data/DBConcurrencyException.cs
@@ -60,7 +60,12 @@ namespace System.Data {
                        : base (message, inner)
                {
                }
-#endif
+#endif\r
+\r
+               private DBConcurrencyException (SerializationInfo si, StreamingContext sc) : base(si, sc)\r
+               {\r
+               }\r
+
                #endregion // Constructors
 
                #region Properties
@@ -99,9 +104,8 @@ namespace System.Data {
                public override void GetObjectData (SerializationInfo info, StreamingContext context)
                {
                        if (info == null)
-                                throw new ArgumentNullException ("info");
+                               throw new ArgumentNullException ("info");
 
-                       info.AddValue ("DataRow", row);
                        base.GetObjectData (info, context);
                }
 

diff --git a/mcs/class/System.Data/System.Data/DataViewSetting.cs b/mcs/class/System.Data/System.Data/DataViewSetting.cs
index 3035f1318f1500a16d6378f868c897c768c57579..4e3314da4770d731d0b471ab7b3538cf7e7a558b 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataViewSetting.cs
+++ b/mcs/class/System.Data/System.Data/DataViewSetting.cs
@@ -45,11 +45,12 @@ namespace System.Data
        {
                #region Fields
 
-               bool defaultSort;
-               DataViewManager viewManager;
+               bool applyDefaultSort;
+               DataViewManager dataViewManager;
                string rowFilter;
                DataViewRowState rowStateFilter;
-               string sortString;
+               string sort;\r
+               DataTable dataTable;
 
                #endregion // Fields
 
@@ -64,13 +65,13 @@ namespace System.Data
                #region Properties
                
                public bool ApplyDefaultSort {
-                       get { return defaultSort; }
-                       set { defaultSort = value; }
+                       get { return applyDefaultSort; }
+                       set { applyDefaultSort = value; }
                }
 
                [Browsable (false)]
                public DataViewManager DataViewManager {
-                       get { return viewManager; }
+                       get { return dataViewManager; }
                }
 
                public string RowFilter {
@@ -84,14 +85,14 @@ namespace System.Data
                }
 
                public string Sort {
-                       get { return sortString; }
-                       set { sortString = value; }
+                       get { return sort; }
+                       set { sort = value; }
                }
 
                [MonoTODO]
                [Browsable (false)]
                public DataTable Table {
-                       get { throw new NotImplementedException (); }
+                       get { return dataTable; }
                }
 
                #endregion // Properties