ChangeLog: Updated.

SiteMapDataSourceView.cs:
SqlDataSourceView.cs:
XmlDataSourceView.cs: Cosmetic changes because of modifications in
        base class, DataSourceView. Changes are to keep things compiling.

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index c4a2a518ddc844a1ac26bd3bbe0415daa6d325ed..651f816340ad8de78004e233f77b28166417b044 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,10 @@
+2004-10-20 Sanjay Gupta <gsanjay@novell.com>
+       
+       * SiteMapDataSourceView.cs: 
+       * SqlDataSourceView.cs:
+       * XmlDataSourceView.cs: Cosmetic changes because of modifications in 
+       base class, DataSourceView. Changes are to keep things compiling. 
+
 2004-10-19 Sanjay Gupta <gsanjay@novell.com>
        
        * SiteMapDataSourceView.cs: Corrected class definition and updated.

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSourceView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSourceView.cs
index 07ac5cf5dea2792fe93c39417ad3ccdc7a499e5c..a0165dd315af1ebfa9e0d69cee90409fcc463f83 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSourceView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/SiteMapDataSourceView.cs
@@ -44,11 +44,24 @@ namespace System.Web.UI.WebControls {
                        this.collection = collection;
                }
                
-               [MonoTODO ("Need to bring in sync with latest DataSourceView class")]
-               public override IEnumerable Select ()\r
-               {\r
-                       throw new NotImplementedException ();\r
-               }\r
+               [MonoTODO]
+               public IEnumerable Select (DataSourceSelectArguments arguments)
+               {
+                       throw new NotImplementedException ();
+               }
+
+               [MonoTODO]
+               protected internal override IEnumerable ExecuteSelect (
+                                               DataSourceSelectArguments arguments)
+               {
+                       throw new NotImplementedException ();
+               }
+               
+               [MonoTODO ("Extra method to keep things compiling, need to remove later")]
+               public override IEnumerable Select ()
+               {
+                       throw new NotImplementedException ();
+               }
 
                SiteMapNodeCollection collection;
        }

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
index db1b1ca056d70e305077cdb6f4f3f156bcabb73d..f01a472da8d843ff46b42695dbe884fa12571210 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSourceView.cs
@@ -50,7 +50,7 @@ namespace System.Web.UI.WebControls {
                }
                
                [MonoTODO]
-               public override int Delete (IDictionary parameters)
+               public int Delete (IDictionary parameters)
                {
                        throw new NotImplementedException ();
                }
@@ -61,13 +61,13 @@ namespace System.Web.UI.WebControls {
                }
                
                [MonoTODO]
-               public override int Insert (IDictionary values)
+               public int Insert (IDictionary values)
                {
                        throw new NotImplementedException ();
                }
                
                [MonoTODO]
-               public override IEnumerable Select ()
+               public IEnumerable Select ()
                {
                        throw new NotImplementedException ();
                }
@@ -78,7 +78,7 @@ namespace System.Web.UI.WebControls {
                }
                
                [MonoTODO]
-               public override int Update (IDictionary parameters, IDictionary values)
+               public int Update (IDictionary parameters, IDictionary values)
                {
                        throw new NotImplementedException ();
                }
@@ -188,7 +188,7 @@ namespace System.Web.UI.WebControls {
                        set { ViewState ["UpdateCommand"] = value; }
                }
                
-               public override string SortExpression {
+               public string SortExpression {
                        get {
                                string val = ViewState ["SortExpression"] as string;
                                return val == null ? "" : val;
@@ -425,6 +425,13 @@ namespace System.Web.UI.WebControls {
                        remove { Events.RemoveHandler (EventUpdating, value); }
                }
                #endregion
+
+               [MonoTODO]
+               protected internal override IEnumerable ExecuteSelect (
+                                               DataSourceSelectArguments arguments)
+               {
+                       throw new NotImplementedException ();
+               }               
        }
        
 }

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSourceView.cs b/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSourceView.cs
index e63efcee41c40fe1ef57a70c244a68d0e6afb645..7e82d154c71ab7637b219ac9b27ee78044873569 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSourceView.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/XmlDataSourceView.cs
@@ -48,7 +48,8 @@ namespace System.Web.UI.WebControls {
                        }
                }
                
-               public override IEnumerable Select ()
+               [MonoTODO]
+               public IEnumerable Select (DataSourceSelectArguments arguments)
                {
                        return nodes;
                }
@@ -60,6 +61,18 @@ namespace System.Web.UI.WebControls {
                string name;
                ArrayList nodes;
        
+               [MonoTODO]
+               protected internal override IEnumerable ExecuteSelect (
+                                               DataSourceSelectArguments arguments)
+               {
+                       throw new NotImplementedException ();
+               }
+               
+               [MonoTODO ("Extra method to keep things compiling, need to remove later")]
+               public override IEnumerable Select ()
+               {
+                       throw new NotImplementedException ();
+               }
        }
 }
 #endif