2009-01-23 Marek Habersack <mhabersack@novell.com>

[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 d7e8cf6c2c92f7dbb812568bfa2a180c37244067..23bf81b24ae6c2b91b3e398ad9705c8f2ec5b62a 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/DataSourceView.cs
+++ b/mcs/class/System.Web/System.Web.UI/DataSourceView.cs
@@ -39,18 +39,21 @@ using System.ComponentModel;
 namespace System.Web.UI {
        public abstract class DataSourceView
        {
-               IDataSource dataSourceOwner;
+               //IDataSource dataSourceOwner;
                string viewName = String.Empty;
 
-               [MonoTODO ("Extra method to keep things compiling")]
-               protected DataSourceView()
-               {                       
-               }
-
-               protected DataSourceView(IDataSource owner, string viewName)
+               protected DataSourceView (IDataSource owner, string viewName)
                {
-                       this.dataSourceOwner = owner;
+                       if (owner == null)
+                               throw new ArgumentNullException ("owner");
+
+                       //this.dataSourceOwner = owner;
                        this.viewName = viewName;
+                       owner.DataSourceChanged += new EventHandler (OnDataSourceChanged);
+               }
+
+               void OnDataSourceChanged (object sender, EventArgs e) {
+                       OnDataSourceViewChanged (EventArgs.Empty);
                }
 
                public virtual void Delete (IDictionary keys, IDictionary values,
@@ -59,16 +62,16 @@ namespace System.Web.UI {
                        if (callBack == null)
                                throw new ArgumentNullException ("callBack");
 
-                       int rowAffected = 0;
-                       Exception passOn = null;
+                       int rowAffected;
                        try {
                                rowAffected = ExecuteDelete (keys, values);
-                       } catch (Exception e) {
-                               passOn = e;
                        }
-
-                       if (!callBack (rowAffected, passOn) && passOn != null)
-                               throw passOn;
+                       catch (Exception e) {
+                               if (!callBack (0, e))
+                                       throw;
+                               return;
+                       }
+                       callBack (rowAffected, null);
                }
 
                protected virtual int ExecuteDelete(IDictionary keys, IDictionary values)
@@ -96,16 +99,16 @@ namespace System.Web.UI {
                        if (callBack == null)
                                throw new ArgumentNullException("callBack");
 
-                       int rowAffected = 0;
-                       Exception passOn = null;
+                       int rowAffected;
                        try {
                                rowAffected = ExecuteInsert (values);
                        } catch (Exception e) {
-                               passOn = e;
+                               if (!callBack (0, e))
+                                       throw;
+                               return;
                        }
 
-                       if (!callBack (rowAffected, passOn) && passOn != null)
-                               throw passOn;
+                       callBack (rowAffected, null);
                }
 
                protected virtual void OnDataSourceViewChanged (EventArgs eventArgs)
@@ -147,24 +150,22 @@ namespace System.Web.UI {
                        callBack (selectList);
                }
 
-               public virtual int Update(IDictionary keys, IDictionary values,
+               public virtual void Update(IDictionary keys, IDictionary values,
                        IDictionary oldValues, DataSourceViewOperationCallback callBack)
                {
                        if (callBack == null)
                                throw new ArgumentNullException ("callBack");
 
-                       int rowAffected = 0;
-                       Exception passOn = null;
+                       int rowAffected;
                        try {
                                rowAffected = ExecuteUpdate (keys, values, oldValues);
                        } catch (Exception e) {
-                               passOn = e;
+                               if (!callBack (0, e))
+                                       throw;
+                               return;
                        }
 
-                       if (!callBack (rowAffected, passOn) && passOn != null)
-                               throw passOn;
-
-                       return rowAffected;
+                       callBack (rowAffected, null);
                } 
                
                public virtual bool CanDelete { get { return false; } }
@@ -189,7 +190,7 @@ namespace System.Web.UI {
                        return eventsList != null;
                }
 
-               public virtual string Name { 
+               public string Name { 
                        get { return viewName; } 
                }