ChangeLog: Updated.

SqlDataSource.cs: Updated Select method definition.
SqlDataSourceStatusEventArgs.cs: Updated class.

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 2396fca14fac50cdb515dbab6f200a7dd08c485e..94e5d0fa3aac96973f0187e75d9b833ec87c007b 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-18 Sanjay Gupta <gsanjay@novell.com>
+
+       * SqlDataSource.cs: Updated Select method definition.
+       * SqlDataSourceStatusEventArgs.cs: Updated class.
+        
 2004-11-15 Lluis Sanchez Gual <lluis@novell.com>
 
        * SqlDataSourceView.cs: Removed implementation of Events (it is inherited

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs
index 9277b11e90d5341f341ed3aefbe89cb3c37e7ac9..48092719c7e95bc6df7029fa95005a8b267560ca 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs
@@ -78,9 +78,12 @@ namespace System.Web.UI.WebControls {
                        return View.Delete (null, null);
                }
                
-               public IEnumerable Select ()
+               public IEnumerable Select (DataSourceSelectArguments args)
                {
-                       return View.Select (null);
+                       //View.Selecting;
+                       IEnumerable enums = View.Select (null);
+                       //View.Selected;
+                       return enums;
                }
                
                public int Update ()

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventArgs.cs
index 022df47d1fd9785f4a4e072fff8e3b97dbe8316c..b8684243ca4e41a8dcf003a2f2d4ea646c7f1414 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventArgs.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceStatusEventArgs.cs
@@ -3,8 +3,10 @@
 //
 // Authors:
 //     Ben Maurer (bmaurer@users.sourceforge.net)
+//     Sanjay Gupta (gsanjay@novell.com)
 //
 // (C) 2003 Ben Maurer
+// (C) 2004 Novell, Inc. (http://www.novell.com)
 //
 
 //
@@ -32,31 +34,39 @@
 using System.Collections;
 using System.Collections.Specialized;
 using System.Text;
+using System.Data;
 
 namespace System.Web.UI.WebControls {
        public class SqlDataSourceStatusEventArgs : EventArgs {
-               public SqlDataSourceStatusEventArgs (IOrderedDictionary outputParameters, object returnValue, int rowsAffected)
+               public SqlDataSourceStatusEventArgs (IDbCommand command, int rowsAffected, Exception exception)
                {
-                       this.outputParameters = outputParameters;
-                       this.returnValue = returnValue;
+                       this.command = command;
                        this.rowsAffected = rowsAffected;
+                       this.exception = exception;
+                       this.exceptionHandled = false;
                }
                
-               IOrderedDictionary outputParameters;
-               object returnValue;
+               IDbCommand command;
+               Exception exception;
                int rowsAffected;
+               bool exceptionHandled;
                
-               public IOrderedDictionary OutputParameters {
-                       get { return outputParameters; }
+               public IDbCommand Command {
+                       get { return command; }
                }
                
-               public object ReturnValue {
-                       get { return returnValue; }
+               public Exception Exception {
+                       get { return exception; }
                }
                
-               public int RowsAffected {
+               public int AffectedRows {
                        get { return rowsAffected; }
                }
+
+               public bool ExceptionHandled {
+                       get { return exceptionHandled; }
+                       set { exceptionHandled = value; }
+               }
        }
 }
 #endif