diff options
Diffstat (limited to 'mcs/class/System.Web/System.Web.UI/Page.cs')
-rw-r--r-- | mcs/class/System.Web/System.Web.UI/Page.cs | 225 |
1 files changed, 70 insertions, 155 deletions
diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs index 8a64c1ba1bd..00c268a2fc3 100644 --- a/mcs/class/System.Web/System.Web.UI/Page.cs +++ b/mcs/class/System.Web/System.Web.UI/Page.cs @@ -58,7 +58,9 @@ namespace System.Web.UI // CAS [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)] [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)] -#if !NET_2_0 +#if NET_2_0 +[RootDesignerSerializer ("Microsoft.VisualStudio.Web.WebForms.RootCodeDomSerializer, " + Consts.AssemblyMicrosoft_VisualStudio_Web, "System.ComponentModel.Design.Serialization.CodeDomSerializer, " + Consts.AssemblySystem_Design, true)] +#else [RootDesignerSerializer ("Microsoft.VSDesigner.WebForms.RootCodeDomSerializer, " + Consts.AssemblyMicrosoft_VSDesigner, "System.ComponentModel.Design.Serialization.CodeDomSerializer, " + Consts.AssemblySystem_Design, true)] #endif [DefaultEvent ("Load"), DesignerCategory ("ASPXCodeBehind")] @@ -70,7 +72,6 @@ namespace System.Web.UI #endif public class Page : TemplateControl, IHttpHandler { - private bool _eventValidation = true; private bool _viewState = true; private bool _viewStateMac; private string _errorPage; @@ -96,20 +97,9 @@ public class Page : TemplateControl, IHttpHandler bool allow_load; // true when the Form collection belongs to this page (GetTypeHashCode) [EditorBrowsable (EditorBrowsableState.Never)] -#if NET_2_0 - public -#else - protected -#endif - const string postEventArgumentID = "__EVENTARGUMENT"; - + protected const string postEventArgumentID = "__EVENTARGUMENT"; [EditorBrowsable (EditorBrowsableState.Never)] -#if NET_2_0 - public -#else - protected -#endif - const string postEventSourceID = "__EVENTTARGET"; + protected const string postEventSourceID = "__EVENTTARGET"; #if NET_2_0 internal const string CallbackArgumentID = "__CALLBACKARGUMENT"; @@ -126,8 +116,6 @@ public class Page : TemplateControl, IHttpHandler ArrayList requireStateControls; Hashtable _validatorsByGroup; HtmlForm _form; - - string _title; #endif #region Constructor @@ -154,18 +142,23 @@ public class Page : TemplateControl, IHttpHandler } [EditorBrowsable (EditorBrowsableState.Never)] - protected bool AspCompatMode - { #if NET_2_0 + public bool AspCompatMode + { get { return false; } -#endif set { throw new NotImplementedException (); } } +#else + protected bool AspCompatMode + { + set { throw new NotImplementedException (); } + } +#endif [EditorBrowsable (EditorBrowsableState.Never)] #if NET_2_0 - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] public bool Buffer { get { return Response.BufferOutput; } @@ -190,7 +183,7 @@ public class Page : TemplateControl, IHttpHandler } #if NET_2_0 - [EditorBrowsableAttribute (EditorBrowsableState.Advanced)] + [EditorBrowsableAttribute (EditorBrowsableState.Advanced)] #endif [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] [Browsable (false), DefaultValue ("")] @@ -207,8 +200,8 @@ public class Page : TemplateControl, IHttpHandler [EditorBrowsable (EditorBrowsableState.Never)] #if NET_2_0 - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] public int CodePage { get { return Response.ContentEncoding.CodePage; } @@ -223,8 +216,8 @@ public class Page : TemplateControl, IHttpHandler [EditorBrowsable (EditorBrowsableState.Never)] #if NET_2_0 - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] public string ContentType { get { return Response.ContentType; } @@ -247,30 +240,22 @@ public class Page : TemplateControl, IHttpHandler } } + [EditorBrowsable (EditorBrowsableState.Never)] #if NET_2_0 - [EditorBrowsable (EditorBrowsableState.Advanced)] - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] public string Culture { get { return Thread.CurrentThread.CurrentCulture.Name; } set { Thread.CurrentThread.CurrentCulture = new CultureInfo (value); } } #else - [EditorBrowsable (EditorBrowsableState.Never)] protected string Culture { set { Thread.CurrentThread.CurrentCulture = new CultureInfo (value); } } #endif -#if NET_2_0 - public virtual bool EnableEventValidation { - get { return _eventValidation; } - set { _eventValidation = value;} - } -#endif - [Browsable (false)] public override bool EnableViewState { @@ -279,16 +264,11 @@ public class Page : TemplateControl, IHttpHandler } #if NET_2_0 - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] #endif [EditorBrowsable (EditorBrowsableState.Never)] -#if NET_2_0 - public -#else - protected -#endif - bool EnableViewStateMac + protected bool EnableViewStateMac { get { return _viewStateMac; } set { _viewStateMac = value; } @@ -320,9 +300,6 @@ public class Page : TemplateControl, IHttpHandler } [Browsable (false)] -#if NET_2_0 - [EditorBrowsable (EditorBrowsableState.Never)] -#endif public override string ID { get { return base.ID; } @@ -356,8 +333,8 @@ public class Page : TemplateControl, IHttpHandler [EditorBrowsable (EditorBrowsableState.Never)] #if NET_2_0 - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] public int LCID { get { return Thread.CurrentThread.CurrentCulture.LCID; } set { Thread.CurrentThread.CurrentCulture = new CultureInfo (value); } @@ -402,8 +379,8 @@ public class Page : TemplateControl, IHttpHandler [EditorBrowsable (EditorBrowsableState.Never)] #if NET_2_0 - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] public string ResponseEncoding { get { return Response.ContentEncoding.WebName; } @@ -453,35 +430,6 @@ public class Page : TemplateControl, IHttpHandler set { _smartNavigation = value; } } -#if NET_2_0 - [MonoTODO] - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [Filterable (false)] - [Browsable (false)] - public virtual string StyleSheetTheme { - get { throw new NotImplementedException (); } - set { throw new NotImplementedException (); } - } - - [MonoTODO] - [Browsable (false)] - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - public virtual string Theme { - get { throw new NotImplementedException (); } - set { throw new NotImplementedException (); } - } -#endif - -#if NET_2_0 - [Localizable (true)] - [Bindable (true)] - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - public string Title { - get { return _title; } - set { _title = value; } - } -#endif - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] [Browsable (false)] public TraceContext Trace @@ -491,8 +439,8 @@ public class Page : TemplateControl, IHttpHandler [EditorBrowsable (EditorBrowsableState.Never)] #if NET_2_0 - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] public bool TraceEnabled { get { return Trace.IsEnabled; } @@ -507,8 +455,8 @@ public class Page : TemplateControl, IHttpHandler [EditorBrowsable (EditorBrowsableState.Never)] #if NET_2_0 - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] public TraceMode TraceModeValue { get { return Trace.TraceMode; } @@ -522,25 +470,29 @@ public class Page : TemplateControl, IHttpHandler #endif [EditorBrowsable (EditorBrowsableState.Never)] - protected int TransactionMode - { #if NET_2_0 + public int TransactionMode + { get { return _transactionMode; } -#endif set { _transactionMode = value; } } +#else + protected int TransactionMode + { + set { _transactionMode = value; } + } +#endif + [EditorBrowsable (EditorBrowsableState.Never)] #if NET_2_0 - [EditorBrowsable (EditorBrowsableState.Advanced)] - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] public string UICulture { get { return Thread.CurrentThread.CurrentUICulture.Name; } set { Thread.CurrentThread.CurrentUICulture = new CultureInfo (value); } } #else - [EditorBrowsable (EditorBrowsableState.Never)] protected string UICulture { set { Thread.CurrentThread.CurrentUICulture = new CultureInfo (value); } @@ -826,15 +778,15 @@ public class Page : TemplateControl, IHttpHandler LosFormatter GetFormatter () { -#if NET_2_0 - PagesSection config = (PagesSection) WebConfigurationManager.GetSection ("system.web/pages"); +#if CONFIGURATION_2_0 + PagesSection config = (PagesSection) WebConfigurationManager.GetWebApplicationSection ("system.web/pages"); #else PagesConfiguration config = PagesConfiguration.GetInstance (_context); #endif byte [] vkey = null; if (config.EnableViewStateMac) { -#if NET_2_0 - MachineKeySection mconfig = (MachineKeySection) WebConfigurationManager.GetSection ("system.web/machineKey"); +#if CONFIGURATION_2_0 + MachineKeySection mconfig = (MachineKeySection) WebConfigurationManager.GetWebApplicationSection ("system.web/machineKey"); vkey = mconfig.ValidationKeyBytes; #else MachineKeyConfig mconfig = HttpContext.GetAppConfig ("system.web/machineKey") as MachineKeyConfig; @@ -947,11 +899,7 @@ public class Page : TemplateControl, IHttpHandler } [EditorBrowsable (EditorBrowsableState.Never)] -#if NET_2_0 || TARGET_JVM - public virtual void ProcessRequest (HttpContext context) -#else public void ProcessRequest (HttpContext context) -#endif { _context = context; if (clientTarget != null) @@ -1014,10 +962,10 @@ public class Page : TemplateControl, IHttpHandler #if NET_2_0 OnInitComplete (EventArgs.Empty); - ApplyMasterPage (); - - if (_title != null && htmlHeader != null) - htmlHeader.Title = _title; + if (masterPageFile != null) { + Controls.Add (Master); + Master.FillPlaceHolders (); + } #endif renderingForm = false; @@ -1329,11 +1277,6 @@ public class Page : TemplateControl, IHttpHandler bool ValidateCollection (ValidatorCollection validators) { -#if NET_2_0 - if (!_eventValidation) - return true; -#endif - if (validators == null || validators.Count == 0) return true; @@ -1388,7 +1331,6 @@ public class Page : TemplateControl, IHttpHandler const int prerendercomplete_mask = 1 << 4; const int savestatecomplete_mask = 1 << 5; - [EditorBrowsable (EditorBrowsableState.Advanced)] public event EventHandler InitComplete { add { event_mask |= initcomplete_mask; @@ -1397,7 +1339,6 @@ public class Page : TemplateControl, IHttpHandler remove { Events.RemoveHandler (InitCompleteEvent, value); } } - [EditorBrowsable (EditorBrowsableState.Advanced)] public event EventHandler LoadComplete { add { event_mask |= loadcomplete_mask; @@ -1414,7 +1355,6 @@ public class Page : TemplateControl, IHttpHandler remove { Events.RemoveHandler (PreInitEvent, value); } } - [EditorBrowsable (EditorBrowsableState.Advanced)] public event EventHandler PreLoad { add { event_mask |= preload_mask; @@ -1423,7 +1363,6 @@ public class Page : TemplateControl, IHttpHandler remove { Events.RemoveHandler (PreLoadEvent, value); } } - [EditorBrowsable (EditorBrowsableState.Advanced)] public event EventHandler PreRenderComplete { add { event_mask |= prerendercomplete_mask; @@ -1432,7 +1371,6 @@ public class Page : TemplateControl, IHttpHandler remove { Events.RemoveHandler (PreRenderCompleteEvent, value); } } - [EditorBrowsable (EditorBrowsableState.Advanced)] public event EventHandler SaveStateComplete { add { event_mask |= savestatecomplete_mask; @@ -1498,21 +1436,21 @@ public class Page : TemplateControl, IHttpHandler _form = form; } - [BrowsableAttribute (false)] - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] public Page PreviousPage { get { return previousPage; } } - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] public bool IsCallback { get { return _requestValueCollection != null && _requestValueCollection [CallbackArgumentID] != null; } } - [BrowsableAttribute (false)] - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] public bool IsCrossPagePostBack { get { return _requestValueCollection != null && isCrossPagePostBack; } } @@ -1528,12 +1466,11 @@ public class Page : TemplateControl, IHttpHandler throw new HttpException (string.Format ("Invalid callback target '{0}'.", callbackTarget)); string callbackArgument = _requestValueCollection [CallbackArgumentID]; - target.RaiseCallbackEvent (callbackArgument); - return target.GetCallbackResult (); + return target.RaiseCallbackEvent (callbackArgument); } - [BrowsableAttribute (false)] - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] public HtmlHead Header { get { return htmlHeader; } } @@ -1543,37 +1480,18 @@ public class Page : TemplateControl, IHttpHandler htmlHeader = header; } - void ApplyMasterPage () - { - if (masterPageFile != null) { - ArrayList appliedMasterPageFiles = new ArrayList (); - - if (Master != null) { - MasterPage.ApplyMasterPageRecursive (Master, appliedMasterPageFiles); - - Master.Page = this; - Controls.Clear (); - Controls.Add (Master); - } - } - } - - [DefaultValueAttribute ("")] - public virtual string MasterPageFile { + [DefaultValueAttribute ("")] + public string MasterPageFile { get { return masterPageFile; } - set { - masterPageFile = value; - masterPage = null; - } + set { masterPageFile = value; masterPage = null; } } - [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] - [BrowsableAttribute (false)] + [DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)] + [BrowsableAttribute (false)] public MasterPage Master { get { if (masterPage == null) - masterPage = MasterPage.CreateMasterPage (this, Context, masterPageFile, contentTemplates); - + masterPage = MasterPageParser.GetCompiledMasterInstance (masterPageFile, Server.MapPath (masterPageFile), Context); return masterPage; } } @@ -1663,13 +1581,10 @@ public class Page : TemplateControl, IHttpHandler } - Hashtable contentTemplates; - [EditorBrowsable (EditorBrowsableState.Never)] + [EditorBrowsable (EditorBrowsableState.Advanced)] protected internal void AddContentTemplate (string templateName, ITemplate template) { - if (contentTemplates == null) - contentTemplates = new Hashtable (); - contentTemplates [templateName] = template; + Master.AddContentTemplate (templateName, template); } #endif |