Merge pull request #4453 from lambdageek/bug-49721

[mono.git] / mcs / class / System.Web / System.Web.UI / DataSourceView.cs

diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceView.cs b/mcs/class/System.Web/System.Web.UI/DataSourceView.cs
index a1a95298eaf1a84e907a821f00cb6c9f00ee9331..f8c4ae5adcd7c60fac25f6fec06851481ad649d5 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/DataSourceView.cs
+++ b/mcs/class/System.Web/System.Web.UI/DataSourceView.cs
@@ -6,7 +6,7 @@
 //     Sanjay Gupta (gsanjay@novell.com)
 //
 // (C) 2003 Ben Maurer
-// (C) 2004 Novell, Inc. (http://www.novell.com)
+// (C) 2004-2010 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -30,7 +30,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 using System.Collections;
 using System.Collections.Specialized;
 using System.Text;
@@ -49,32 +48,37 @@ namespace System.Web.UI {
 
                        //this.dataSourceOwner = owner;
                        this.viewName = viewName;
+                       owner.DataSourceChanged += new EventHandler (OnDataSourceChanged);
                }
 
-               public virtual void Delete (IDictionary keys, IDictionary values,
-                                               DataSourceViewOperationCallback callBack)
+               void OnDataSourceChanged (object sender, EventArgs e) {
+                       OnDataSourceViewChanged (EventArgs.Empty);
+               }
+
+               public virtual void Delete (IDictionary keys, IDictionary oldValues,
+                                               DataSourceViewOperationCallback callback)
                {
-                       if (callBack == null)
+                       if (callback == null)
                                throw new ArgumentNullException ("callBack");
 
                        int rowAffected;
                        try {
-                               rowAffected = ExecuteDelete (keys, values);
+                               rowAffected = ExecuteDelete (keys, oldValues);
                        }
                        catch (Exception e) {
-                               if (!callBack (0, e))
+                               if (!callback (0, e))
                                        throw;
                                return;
                        }
-                       callBack (rowAffected, null);
+                       callback (rowAffected, null);
                }
 
-               protected virtual int ExecuteDelete(IDictionary keys, IDictionary values)
+               protected virtual int ExecuteDelete(IDictionary keys, IDictionary oldValues)
                {
                        throw new NotSupportedException ();
                }
 
-               protected virtual int ExecuteInsert (IDictionary keys)
+               protected virtual int ExecuteInsert (IDictionary values)
                {
                        throw new NotSupportedException();
                }
@@ -89,29 +93,29 @@ namespace System.Web.UI {
                }
 
                public virtual void Insert (IDictionary values, 
-                                       DataSourceViewOperationCallback callBack)
+                                       DataSourceViewOperationCallback callback)
                {
-                       if (callBack == null)
-                               throw new ArgumentNullException("callBack");
+                       if (callback == null)
+                               throw new ArgumentNullException("callback");
 
                        int rowAffected;
                        try {
                                rowAffected = ExecuteInsert (values);
                        } catch (Exception e) {
-                               if (!callBack (0, e))
+                               if (!callback (0, e))
                                        throw;
                                return;
                        }
 
-                       callBack (rowAffected, null);
+                       callback (rowAffected, null);
                }
 
-               protected virtual void OnDataSourceViewChanged (EventArgs eventArgs)
+               protected virtual void OnDataSourceViewChanged (EventArgs e)
                {
                        if (eventsList != null) {
                                EventHandler evtHandler = eventsList [EventDataSourceViewChanged] as EventHandler;
                                if (evtHandler != null)
-                                       evtHandler(this, eventArgs);
+                                       evtHandler(this, e);
                        }
                }
                
@@ -133,34 +137,34 @@ namespace System.Web.UI {
                        return;
                }
 
-               public virtual void Select (DataSourceSelectArguments selectArgs,
-                                               DataSourceViewSelectCallback callBack)
+               public virtual void Select (DataSourceSelectArguments arguments,
+                                               DataSourceViewSelectCallback callback)
                {
-                       if (callBack == null)
+                       if (callback == null)
                                throw new ArgumentNullException("callBack");
 
-                       selectArgs.RaiseUnsupportedCapabilitiesError (this);
+                       arguments.RaiseUnsupportedCapabilitiesError (this);
                        
-                       IEnumerable selectList = ExecuteSelect (selectArgs);
-                       callBack (selectList);
+                       IEnumerable selectList = ExecuteSelect (arguments);
+                       callback (selectList);
                }
 
                public virtual void Update(IDictionary keys, IDictionary values,
-                       IDictionary oldValues, DataSourceViewOperationCallback callBack)
+                       IDictionary oldValues, DataSourceViewOperationCallback callback)
                {
-                       if (callBack == null)
-                               throw new ArgumentNullException ("callBack");
+                       if (callback == null)
+                               throw new ArgumentNullException ("callback");
 
                        int rowAffected;
                        try {
                                rowAffected = ExecuteUpdate (keys, values, oldValues);
                        } catch (Exception e) {
-                               if (!callBack (0, e))
+                               if (!callback (0, e))
                                        throw;
                                return;
                        }
 
-                       callBack (rowAffected, null);
+                       callback (rowAffected, null);
                } 
                
                public virtual bool CanDelete { get { return false; } }
@@ -200,5 +204,4 @@ namespace System.Web.UI {
        }
        
 }
-#endif