diff options
8 files changed, 142 insertions, 16 deletions
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSource.cs index 098520a1704..10cbe3cb5dc 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSource.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/AccessDataSource.cs @@ -73,7 +73,7 @@ namespace System.Web.UI.WebControls { void ViewChanged (object source, EventArgs e) { - OnDataSourceChanged (e); + RaiseDataSourceChangedEvent (e); } [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog index 86fe8aab54f..0c45e7f2f95 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog @@ -1,3 +1,10 @@ +2006-02-27 Chris Toshok <toshok@ximian.com> + + * SqlDataSource.cs: track change to DataSourceControl's protected + methods. + + * AccessDataSource.cs: same. + 2006-02-27 Vladimir Krasnov <vladimirk@mainsoft.com> * ListControl.cs: fixed SelectedIndex property, fixed selection 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 16cce553efe..069795afe35 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/SqlDataSource.cs @@ -398,7 +398,7 @@ namespace System.Web.UI.WebControls { void ViewChanged (object source, EventArgs e) { - OnDataSourceChanged (e); + RaiseDataSourceChangedEvent (e); } } } diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index 200ceff2b40..d095829ff9c 100644 --- a/mcs/class/System.Web/System.Web.UI/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI/ChangeLog @@ -1,3 +1,13 @@ +2006-02-27 Chris Toshok <toshok@ximian.com> + + * DataSourceView.cs: Name isn't virtual. + + * DataSourceControl.cs: beat this class over the head with the + corcompare stick. + + * DataSourceControlBuilder.cs: new stubbed control builder for + DataSourceControl. + 2006-02-23 Chris Toshok <toshok@ximian.com> * Page.cs: more corcompare work. diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceControl.cs b/mcs/class/System.Web/System.Web.UI/DataSourceControl.cs index ba0914d2636..98a47c9d1db 100644 --- a/mcs/class/System.Web/System.Web.UI/DataSourceControl.cs +++ b/mcs/class/System.Web/System.Web.UI/DataSourceControl.cs @@ -31,9 +31,16 @@ #if NET_2_0 using System.Collections; using System.Collections.Specialized; +using System.ComponentModel; using System.Text; namespace System.Web.UI { + + [DesignerAttribute ("System.Web.UI.Design.DataSourceDesigner, " + Consts.AssemblySystem_Design, + "System.ComponentModel.Design.IDesigner")] + [ControlBuilderAttribute (typeof (DataSourceControlBuilder))] + [NonVisualControlAttribute] + [BindableAttribute (false)] public abstract class DataSourceControl : Control, IDataSource, System.ComponentModel.IListSource { @@ -41,15 +48,33 @@ namespace System.Web.UI { { } + [MonoTODO] + [EditorBrowsable (EditorBrowsableState.Never)] + public override void ApplyStyleSheetSkin (Page page) + { + throw new NotImplementedException (); + } + protected override ControlCollection CreateControlCollection () { return new EmptyControlCollection (this); } - - protected virtual DataSourceView GetView (string viewName) + + [MonoTODO ("why override?")] + [EditorBrowsable (EditorBrowsableState.Never)] + public override Control FindControl (string id) { - return null; + return base.FindControl (id); + } + + [MonoTODO ("why override?")] + [EditorBrowsable (EditorBrowsableState.Never)] + public override void Focus () + { + base.Focus(); } + + protected abstract DataSourceView GetView (string viewName); DataSourceView IDataSource.GetView (string viewName) { @@ -71,13 +96,64 @@ namespace System.Web.UI { return ListSourceHelper.GetList (this); } + [MonoTODO ("why override?")] + [EditorBrowsable (EditorBrowsableState.Never)] + public override bool HasControls () + { + return base.HasControls (); + } + + protected virtual void RaiseDataSourceChangedEvent (EventArgs e) + { + EventHandler eh = Events [dataSourceChanged] as EventHandler; + if (eh != null) + eh (this, e); + } + + [MonoTODO ("why override?")] + [EditorBrowsable (EditorBrowsableState.Never)] + public override void RenderControl (HtmlTextWriter tw) + { + base.RenderControl (tw); + } + + [MonoTODO ("why override?")] + [EditorBrowsable (EditorBrowsableState.Never)] + public override string ClientID { + get { return base.ClientID; } + } + + [MonoTODO ("why override?")] + [EditorBrowsable (EditorBrowsableState.Never)] + public override ControlCollection Controls { + get { return base.Controls; } + } + + [MonoTODO ("why override?")] + [DefaultValue (false)] + [Browsable (false)] + [EditorBrowsable (EditorBrowsableState.Never)] + public override bool EnableTheming { + get { return base.EnableTheming; } + set { base.EnableTheming = value; } + } + + [MonoTODO ("why override?")] + [DefaultValue ("")] + [Browsable (false)] + [EditorBrowsable (EditorBrowsableState.Never)] + public override string SkinID { + get { return base.SkinID; } + set { base.SkinID = value; } + } + bool System.ComponentModel.IListSource.ContainsListCollection { get { return ListSourceHelper.ContainsListCollection (this); } } - //public override bool EnablePersonalization { get; set; } - //public override bool EnableTheming { get; set; } - //public override string SkinID { get; set; } + [Browsable (false)] + [EditorBrowsable (EditorBrowsableState.Never)] + [DefaultValue (false)] public override bool Visible { get { return false; } set { throw new NotSupportedException (); } @@ -88,13 +164,7 @@ namespace System.Web.UI { add { Events.AddHandler (dataSourceChanged, value); } remove { Events.RemoveHandler (dataSourceChanged, value); } } - - protected virtual void OnDataSourceChanged (EventArgs e) - { - EventHandler eh = Events [dataSourceChanged] as EventHandler; - if (eh != null) - eh (this, e); - } + } } #endif diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceControlBuilder.cs b/mcs/class/System.Web/System.Web.UI/DataSourceControlBuilder.cs new file mode 100644 index 00000000000..97f8b07ce2a --- /dev/null +++ b/mcs/class/System.Web/System.Web.UI/DataSourceControlBuilder.cs @@ -0,0 +1,38 @@ +// +// System.Web.UI.DataSourceControlBuilder.cs +// +// Authors: +// Chris Toshok (toshok@ximian.com) +// +// (C) 2006 Novell, Inc (http://www.novell.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +#if NET_2_0 + +namespace System.Web.UI { + + public sealed class DataSourceControlBuilder : ControlBuilder + { + } + +} +#endif diff --git a/mcs/class/System.Web/System.Web.UI/DataSourceView.cs b/mcs/class/System.Web/System.Web.UI/DataSourceView.cs index ddcca295f05..fa8efa1ce84 100644 --- a/mcs/class/System.Web/System.Web.UI/DataSourceView.cs +++ b/mcs/class/System.Web/System.Web.UI/DataSourceView.cs @@ -182,7 +182,7 @@ namespace System.Web.UI { return eventsList != null; } - public virtual string Name { + public string Name { get { return viewName; } } diff --git a/mcs/class/System.Web/System.Web.dll.sources b/mcs/class/System.Web/System.Web.dll.sources index 98f6bef02a1..ea60db9921e 100644 --- a/mcs/class/System.Web/System.Web.dll.sources +++ b/mcs/class/System.Web/System.Web.dll.sources @@ -468,6 +468,7 @@ System.Web.UI/DataBoundLiteralControl.cs System.Web.UI/DataSourceCacheExpiry.cs System.Web.UI/DataSourceCapabilities.cs System.Web.UI/DataSourceControl.cs +System.Web.UI/DataSourceControlBuilder.cs System.Web.UI/DataSourceOperation.cs System.Web.UI/DataSourceSelectArguments.cs System.Web.UI/DataSourceView.cs |