2009-10-30 Veerapuram Varadhan <vvaradhan@novell.com>

	* DataTable.cs: Reuse old utility methods for raising DataTable
	clearing/cleared events.
	* DataRowCollection.cs (Clear): Raise DataTable clearing/cleared
	events only for non 1.x profiles.  Fixes broken 1.x build.

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

diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
index 2604e6bed9602cf06cbbec1150cb451b9bcfae62..44087fcb7cd7a5987c39ba8c3f957bb747c2d5c0 100644 (file)
--- a/mcs/class/System.Data/System.Data/ChangeLog
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -1,12 +1,19 @@
+2009-10-30  Veerapuram Varadhan  <vvaradhan@novell.com>
+
+       * DataTable.cs: Reuse old utility methods for raising DataTable 
+       clearing/cleared events.
+       * DataRowCollection.cs (Clear): Raise DataTable clearing/cleared 
+       events only for non 1.x profiles.  Fixes broken 1.x build.
+       
 2009-10-30  Veerapuram Varadhan  <vvaradhan@novell.com>
 
        ** Fixes 448296
-       * DataTable (Clear): Do not raise TableClearing/Cleared events as 
+       * DataTable.cs (Clear): Do not raise TableClearing/Cleared events as 
        they will be raised from DataRowCollection.Clear().  New utility methods 
        for raising TableClearing/TableCleared events from outside DataTable.  
        Don't manually reset indexes as ResetIndexes is called from 
        DataRowCollection.Clear
-       * DataRowCollection (Clear): Raise TableClearing/Cleared events accordingly.
+       * DataRowCollection.cs (Clear): Raise TableClearing/Cleared events accordingly.
        
 2009-10-29  Veerapuram Varadhan  <vvaradhan@novell.com>
 

diff --git a/mcs/class/System.Data/System.Data/DataRowCollection.cs b/mcs/class/System.Data/System.Data/DataRowCollection.cs
index ae6ac09282c91da208fba78f8ea1ed546405f0e0..3cef9793b8ef50d11ee8fa01d4207f8459853e33 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataRowCollection.cs
+++ b/mcs/class/System.Data/System.Data/DataRowCollection.cs
@@ -163,13 +163,16 @@ namespace System.Data
                                }
                        }
 
-                       table.ClearingDataTable ();
-                       
+#if NET_2_0
+                       table.DataTableClearing ();
+#endif 
                        List.Clear ();
 
                        // Remove from indexes
                        table.ResetIndexes ();
-                       table.ClearedDataTable ();
+#if NET_2_0
+                       table.DataTableCleared ();
+#endif
                        OnListChanged (this, new ListChangedEventArgs (ListChangedType.Reset, -1, -1));
                }
 

diff --git a/mcs/class/System.Data/System.Data/DataTable.cs b/mcs/class/System.Data/System.Data/DataTable.cs
index 3b0a80cc2cf20abef6494580c4da5db058bec67c..21f54308f3973638285f81312b6f6684ad947e32 100644 (file)
--- a/mcs/class/System.Data/System.Data/DataTable.cs
+++ b/mcs/class/System.Data/System.Data/DataTable.cs
@@ -259,18 +259,6 @@ namespace System.Data {
                        OnRowChanging (e);\r
                }\r
                \r
-               internal void ClearingDataTable () \r
-               {\r
-                       DataTableClearEventArgs e = new DataTableClearEventArgs (this);\r
-                       OnTableClearing (e);\r
-               }\r
-               \r
-               internal void ClearedDataTable ()\r
-               {\r
-                       DataTableClearEventArgs e = new DataTableClearEventArgs (this);\r
-                       OnTableCleared (e);                     \r
-               }\r
-               \r
                /// <summary>\r
                /// Gets the collection of child relations for this DataTable.\r
                /// </summary>\r
@@ -789,10 +777,6 @@ namespace System.Data {
                        _rows.Clear ();\r
                }\r
 \r
-               // defined in the NET_2_0 profile\r
-               partial void DataTableClearing ();\r
-               partial void DataTableCleared ();\r
-\r
                /// <summary>\r
                /// Clones the structure of the DataTable, including\r
                ///  all DataTable schemas and constraints.\r
@@ -2995,7 +2979,7 @@ namespace System.Data {
                                TableCleared (this, e);\r
                }\r
 \r
-               partial void DataTableCleared ()\r
+               internal void DataTableCleared ()\r
                {\r
                        OnTableCleared (new DataTableClearEventArgs (this));\r
                }\r
@@ -3006,7 +2990,7 @@ namespace System.Data {
                                TableClearing (this, e);\r
                }\r
 \r
-               partial void DataTableClearing ()\r
+               internal void DataTableClearing ()\r
                {\r
                        OnTableClearing (new DataTableClearEventArgs (this));\r
                }\r