2002-06-30 Gonzalo Paniagua Javier <gonzalo@ximian.com>
authorGonzalo Paniagua Javier <gonzalo.mono@gmail.com>
Sun, 30 Jun 2002 20:44:49 +0000 (20:44 -0000)
committerGonzalo Paniagua Javier <gonzalo.mono@gmail.com>
Sun, 30 Jun 2002 20:44:49 +0000 (20:44 -0000)
* System.Web/HttpResponse.cs:
* System.Web.SessionState/HttpSessionState.cs:
* System.Web.UI/LiteralControl.cs:
* System.Web.UI.HtmlControls/HtmlAnchor.cs:
* System.Web.UI.HtmlControls/HtmlButton.cs:
* System.Web.UI.HtmlControls/HtmlControl.cs:
* System.Web.UI.HtmlControls/HtmlForm.cs:
* System.Web.UI.HtmlControls/HtmlGenericControl.cs:
* System.Web.UI.HtmlControls/HtmlInputButton.cs:
* System.Web.UI.HtmlControls/HtmlInputCheckBox.cs:
* System.Web.UI.HtmlControls/HtmlInputControl.cs:
* System.Web.UI.HtmlControls/HtmlInputFile.cs:
* System.Web.UI.HtmlControls/HtmlInputHidden.cs:
* System.Web.UI.HtmlControls/HtmlInputImage.cs:
* System.Web.UI.HtmlControls/HtmlInputRadioButton.cs:
* System.Web.UI.HtmlControls/HtmlInputText.cs:
* System.Web.UI.HtmlControls/HtmlSelect.cs:
* System.Web.UI.HtmlControls/HtmlTable.cs:
* System.Web.UI.HtmlControls/HtmlTableCell.cs:
* System.Web.UI.HtmlControls/HtmlTableRow.cs:
* System.Web.UI.HtmlControls/HtmlTextArea.cs:

Fixes based on class status page:

- Add attributes (DefaultEvent, ParseChildren).
- Fix declarations.
- Explicitly implement some interfaces (IPostBackDataHandler
and IPostBackEventHandler).
- Implemented some missing methods.

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

25 files changed:
mcs/class/System.Web/System.Web.SessionState/ChangeLog
mcs/class/System.Web/System.Web.SessionState/HttpSessionState.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlButton.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlGenericControl.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputCheckBox.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputControl.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputFile.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputHidden.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputText.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTable.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableCell.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableRow.cs
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTextArea.cs
mcs/class/System.Web/System.Web.UI/ChangeLog
mcs/class/System.Web/System.Web.UI/LiteralControl.cs
mcs/class/System.Web/System.Web/ChangeLog
mcs/class/System.Web/System.Web/HttpResponse.cs

index 199a6ddd407944473454cd6fcfedf919bc476c6f..a34f93c7f6ab8025322359dd3c612f2a90836976 100644 (file)
@@ -1,3 +1,14 @@
+2002-06-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * System.Web.SessionState/HttpSessionState.cs: 
+       Fixes based on class status page:
+       
+               - Add attributes (DefaultEvent, ParseChildren).
+               - Fix declarations.
+               - Explicitly implement some interfaces (IPostBackDataHandler
+               and IPostBackEventHandler).
+               - Implemented some missing methods.
+
 2002-06-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * HttpSessionState.cs: implemented more methods/properties.
index 83ca50e4094b0d087ce7c701578d2dd88f2fe3c6..ed90f6bc0a0d3ea30174850dc86ada34bb0de2e2 100644 (file)
@@ -49,6 +49,7 @@ public sealed class HttpSessionState : ICollection, IEnumerable
        public int CodePage
        {
                get { return 0; }
+               set { }
        }
 
        public HttpSessionState Contents
index 08e580fe84011345ca28ed2006c9fa33217b0564..a005cfc13f16175cc4e056565819af7187838cea 100644 (file)
@@ -1,3 +1,32 @@
+2002-06-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * System.Web.UI.HtmlControls/HtmlAnchor.cs: 
+       * System.Web.UI.HtmlControls/HtmlButton.cs: 
+       * System.Web.UI.HtmlControls/HtmlControl.cs: 
+       * System.Web.UI.HtmlControls/HtmlForm.cs: 
+       * System.Web.UI.HtmlControls/HtmlGenericControl.cs: 
+       * System.Web.UI.HtmlControls/HtmlInputButton.cs: 
+       * System.Web.UI.HtmlControls/HtmlInputCheckBox.cs: 
+       * System.Web.UI.HtmlControls/HtmlInputControl.cs: 
+       * System.Web.UI.HtmlControls/HtmlInputFile.cs: 
+       * System.Web.UI.HtmlControls/HtmlInputHidden.cs: 
+       * System.Web.UI.HtmlControls/HtmlInputImage.cs: 
+       * System.Web.UI.HtmlControls/HtmlInputRadioButton.cs: 
+       * System.Web.UI.HtmlControls/HtmlInputText.cs: 
+       * System.Web.UI.HtmlControls/HtmlSelect.cs: 
+       * System.Web.UI.HtmlControls/HtmlTable.cs: 
+       * System.Web.UI.HtmlControls/HtmlTableCell.cs: 
+       * System.Web.UI.HtmlControls/HtmlTableRow.cs: 
+       * System.Web.UI.HtmlControls/HtmlTextArea.cs: 
+
+       Fixes based on class status page:
+       
+               - Add attributes (DefaultEvent, ParseChildren).
+               - Fix declarations.
+               - Explicitly implement some interfaces (IPostBackDataHandler
+               and IPostBackEventHandler).
+               - Implemented some missing methods.
+
 2002-06-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * HtmlForm.cs:
index f469b7ee1c2bbb4c3d3600c27a629da20843cf51..7b210c297aa65d0511dbe8a9d039264c51497c73 100644 (file)
@@ -4,11 +4,13 @@
 */\r
 \r
 using System;\r
+using System.ComponentModel;\r
 using System.Web;\r
 using System.Web.UI;\r
 \r
 namespace System.Web.UI.HtmlControls{\r
        \r
+       [DefaultEvent("ServerClick")]\r
        public class HtmlAnchor : HtmlContainerControl, IPostBackEventHandler{\r
                \r
                private static readonly object EventServerClick;\r
@@ -19,6 +21,11 @@ namespace System.Web.UI.HtmlControls{
                \r
                public HtmlAnchor(): base("a"){}\r
                \r
+               protected override void OnPreRender (EventArgs e)\r
+               {\r
+                       base.OnPreRender (e);\r
+               }\r
+\r
                protected virtual void OnServerClick(EventArgs e){\r
                        EventHandler handler;\r
                        handler = (EventHandler) Events[EventServerClick];\r
index b926ef0f18452833424703d3f168cd29d21535e6..266f5a873b51692dddc7e6b6c07ab6588c756fe3 100644 (file)
@@ -4,11 +4,13 @@
 */\r
 \r
 using System;\r
+using System.ComponentModel;\r
 using System.Web;\r
 using System.Web.UI;\r
 \r
 namespace System.Web.UI.HtmlControls{\r
        \r
+       [DefaultEvent("ServerClick")]\r
        public class HtmlButton : HtmlContainerControl, IPostBackEventHandler{\r
                \r
                private static readonly object EventServerClick;\r
index 4907fabd9fd8858bd1ce5bc5374cb37cc579fbb7..3a830dc3d48b1a8517f887622de8a15512d6114e 100644 (file)
@@ -29,6 +29,11 @@ namespace System.Web.UI.HtmlControls{
                        if(tag != null && tag != String.Empty) _tagName = tag;\r
                }\r
                \r
+               protected override ControlCollection CreateControlCollection ()\r
+               {\r
+                       return new EmptyControlCollection (this);\r
+               }\r
+\r
                internal static string AttributeToString(int n){\r
                        if (n != -1)return n.ToString(NumberFormatInfo.InvariantInfo);\r
                        return null;\r
index 73e7b5e898afb0cf82c1a2fca09de4242341eaaa..9c05d701a9926407e148cc833a619263c81d0444 100644 (file)
@@ -135,7 +135,7 @@ namespace System.Web.UI.HtmlControls{
                        }\r
                }\r
                \r
-               public string Name{\r
+               public virtual string Name{\r
                        get{\r
                                string attr = Attributes["name"];\r
                                if (attr != null){\r
index 619ad693642987b8c23800e691c1852ad119c57d..e91265ed61adca8740a8608a401d004d3bfa283d 100644 (file)
@@ -1,23 +1,35 @@
-//\r
-// System.Web.UI.HtmlControls.HtmlGenericControl.cs\r
-//\r
-// Author:\r
-       //   Bob Smith <bob@thestuff.net>\r
-       //\r
-       // (C) Bob Smith\r
-       //\r
-       \r
-       using System;\r
-       using System.Web;\r
-       using System.Web.UI;\r
-       \r
-       namespace System.Web.UI.HtmlControls{\r
-               \r
-               public class HtmlGenericControl : HtmlContainerControl {\r
-                       \r
-                       public HtmlGenericControl(){}\r
-                       \r
-                       public HtmlGenericControl(string tag): base(tag){}\r
-                       \r
-               }\r
-       }\r
+//
+// System.Web.UI.HtmlControls.HtmlGenericControl.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+       
+using System;
+using System.Web;
+using System.Web.UI;
+
+namespace System.Web.UI.HtmlControls{
+       
+       [ConstructorNeedsTag]
+       public class HtmlGenericControl : HtmlContainerControl {
+               
+               public HtmlGenericControl() :
+                       this ("span")
+               {
+               }
+               
+               public HtmlGenericControl (string tag) :
+                       base(tag)
+               {
+               }
+               
+               public override string TagName
+               {
+                       get { return base.TagName; }
+               }
+       }
+}
+
index d9e371a7f8ac5e499ac616a2649c686543c5ff88..75e6688670e3556a68613eb7531171d783f012ec 100755 (executable)
@@ -4,12 +4,14 @@
 */\r
 \r
 using System;\r
+using System.ComponentModel;\r
+using System.Globalization;\r
 using System.Web;\r
 using System.Web.UI;\r
-using System.Globalization;\r
 \r
 namespace System.Web.UI.HtmlControls{\r
        \r
+       [DefaultEvent("ServerClick")]\r
        public class HtmlInputButton : HtmlInputControl, IPostBackEventHandler{\r
                \r
                private static readonly object EventServerClick;\r
@@ -20,14 +22,25 @@ namespace System.Web.UI.HtmlControls{
                \r
                public HtmlInputButton(string type): base(type){}\r
                \r
-               protected void OnServerClick(EventArgs e){\r
+               protected override void OnPreRender (EventArgs e)\r
+               {\r
+                       base.OnPreRender(e);\r
+               }\r
+\r
+               protected override void RenderAttributes (HtmlTextWriter writer)\r
+               {\r
+                       base.RenderAttributes (writer);\r
+               }\r
+\r
+               protected virtual void OnServerClick(EventArgs e){\r
                        EventHandler handler = (EventHandler) Events[EventServerClick];\r
                        if (handler != null){\r
                                handler.Invoke(this, e);\r
                        }\r
                }\r
                \r
-               public void RaisePostBackEvent(string eventArgument){\r
+               void IPostBackEventHandler.RaisePostBackEvent (string eventArgument)\r
+               {\r
                        if(CausesValidation == true){\r
                                Page.Validate();\r
                        }\r
index c73915abc15de867e585f3476fc9feda91669c8c..f93e60a6a61974d9c9fa4ec1d76b55fd00cad72e 100755 (executable)
@@ -4,33 +4,45 @@
 */\r
 \r
 using System;\r
+using System.Collections.Specialized;\r
+using System.ComponentModel;\r
+using System.Globalization;\r
 using System.Web;\r
 using System.Web.UI;\r
-using System.Globalization;\r
-using System.Collections.Specialized;\r
 \r
 namespace System.Web.UI.HtmlControls{\r
        \r
+       [DefaultEvent("ServerChange")]\r
        public class HtmlInputCheckBox : HtmlInputControl, IPostBackDataHandler{\r
                \r
                private static readonly object EventServerChange;\r
                \r
                public HtmlInputCheckBox(): base("checkbox"){}\r
                \r
-               public bool LoadPostData(string postDataKey, NameValueCollection postCollection){\r
-                       string postValue = postCollection[postDataKey];\r
+               bool IPostBackDataHandler.LoadPostData (string postDataKey, \r
+                                                              NameValueCollection postCollection)\r
+               {\r
+                       string postValue = postCollection [postDataKey];\r
                        bool postChecked = false;\r
+                       bool retval = false;\r
+\r
                        if (postValue != null)\r
                                postChecked = postValue.Length > 0;\r
-                       Checked = postChecked;\r
-                       return (postChecked == Checked == false);\r
+\r
+                       if (Checked != postChecked){\r
+                               retval = true;\r
+                               Checked = postChecked;\r
+                       }\r
+\r
+                       return retval;\r
                }\r
                \r
-               public void RaisePostDataChangedEvent(){\r
-                       OnServerChange(EventArgs.Empty);\r
+               void IPostBackDataHandler.RaisePostDataChangedEvent ()\r
+               {\r
+                       OnServerChange (EventArgs.Empty);\r
                }\r
                \r
-               protected void OnServerChange(EventArgs e){\r
+               protected virtual void OnServerChange(EventArgs e){\r
                        EventHandler handler = (EventHandler) Events[EventServerChange];\r
                        if (handler != null) handler.Invoke(this, e);\r
                }\r
index 5d4a6ce95c71f12faf5c511a8bb23cc2594fdaa5..aeb0b539a4f5352b5bf8eaf2f741295ee860f53d 100755 (executable)
@@ -11,7 +11,7 @@ using System.Globalization;
 namespace System.Web.UI.HtmlControls
 {
        
-       public class HtmlInputControl : HtmlControl
+       public abstract class HtmlInputControl : HtmlControl
        {
                
                public HtmlInputControl (string type) : base ("input")
@@ -37,7 +37,7 @@ namespace System.Web.UI.HtmlControls
                {
                        get { return Name; }
                }
-               
+
                public string Type
                {
                        get {
index b0e4710db6a17ad1f0390956f1db80b414752be8..acd09293a443a10f8314266e0050ff47a33dc61e 100755 (executable)
@@ -15,14 +15,18 @@ namespace System.Web.UI.HtmlControls{
                \r
                public HtmlInputFile():base("file"){}\r
                \r
-               public virtual bool LoadPostData(string postDataKey, NameValueCollection postCollection){\r
-                       string postValue = postCollection[postDataKey];\r
+               bool IPostBackDataHandler.LoadPostData (string postDataKey,\r
+                                                      NameValueCollection postCollection)\r
+               {\r
+                       string postValue = postCollection [postDataKey];\r
                        if (postValue != null)\r
                                Value = postValue;\r
                        return false;\r
                }\r
                \r
-               public virtual void RaisePostDataChangedEvent(){}\r
+               void IPostBackDataHandler.RaisePostDataChangedEvent ()\r
+               {\r
+               }\r
                \r
                public string Accept{\r
                        get{\r
index b2ff1bfdba884da58a30a1aa1f4e3c7b1d6fa999..2a3dce63faf86e2acb9be1f2d5822f6423259574 100755 (executable)
@@ -4,13 +4,15 @@
 */\r
 \r
 using System;\r
+using System.Collections.Specialized;\r
+using System.ComponentModel;\r
+using System.Globalization;\r
 using System.Web;\r
 using System.Web.UI;\r
-using System.Globalization;\r
-using System.Collections.Specialized;\r
 \r
 namespace System.Web.UI.HtmlControls{\r
        \r
+       [DefaultEvent("ServerChange")]\r
        public class HtmlInputHidden : HtmlInputControl, IPostBackDataHandler{\r
                \r
                private static readonly object EventServerChange;\r
@@ -19,20 +21,24 @@ namespace System.Web.UI.HtmlControls{
                {\r
                }\r
                \r
-               public bool LoadPostData(string postDataKey, NameValueCollection postCollection){\r
-                       string postValue = postCollection[postDataKey];\r
+               bool IPostBackDataHandler.LoadPostData (string postDataKey,\r
+                                                      NameValueCollection postCollection)\r
+               {\r
+                       string postValue = postCollection [postDataKey];\r
                        if (postValue != null)\r
                                Value = postValue;\r
                        return false;\r
                }\r
                \r
-               public virtual void RaisePostDataChangedEvent(){\r
-                       OnServerChange(EventArgs.Empty);\r
+               void IPostBackDataHandler.RaisePostDataChangedEvent ()\r
+               {\r
+                       // don't need anything. LoadPostData always returns false.\r
                }\r
                \r
-               protected void OnServerChange(EventArgs e){\r
-                       EventHandler handler = (EventHandler) Events[EventServerChange];\r
-                       if (handler != null) handler.Invoke(this, e);\r
+               protected virtual void OnServerChange (EventArgs e)\r
+               {\r
+                       EventHandler handler = (EventHandler) Events [EventServerChange];\r
+                       if (handler != null) handler.Invoke (this, e);\r
                }\r
                \r
                protected override void OnPreRender(EventArgs e){\r
index 1854a3b4dd2013dda01def7a84b6d5710f1f5243..b8e5f38facea897e067f7bdc2b902a13e7742419 100755 (executable)
@@ -24,12 +24,20 @@ namespace System.Web.UI.HtmlControls{
                        }\r
                }\r
                \r
-               protected void OnServerClick(ImageClickEventArgs e){\r
+               protected override void RenderAttributes(HtmlTextWriter writer)\r
+               {\r
+                       base.RenderAttributes (writer);\r
+                       // Anything else?\r
+               }\r
+\r
+               protected virtual void OnServerClick(ImageClickEventArgs e){\r
                        ImageClickEventHandler handler = (ImageClickEventHandler) Events[EventServerClick];\r
-                       // if (handler != null) handler.Invoke(this, e);\r
+                       if (handler != null) handler (this, e);\r
                }\r
                \r
-               public bool LoadPostData(string postDataKey, NameValueCollection postCollection){\r
+               bool IPostBackDataHandler.LoadPostData (string postDataKey,\r
+                                                      NameValueCollection postCollection)\r
+               {\r
                        string postX = postCollection[String.Concat(RenderedName,".x")];\r
                        string postY = postCollection[String.Concat(RenderedName,".y")];\r
                        if (postX != null && postY != null && postX.Length >= 0 && postY.Length >= 0){\r
@@ -40,14 +48,16 @@ namespace System.Web.UI.HtmlControls{
                        return false;\r
                }\r
                \r
-               public void RaisePostBackEvent(string eventArgument){\r
-                       if (CausesValidation){\r
+               void IPostBackEventHandler.RaisePostBackEvent (string eventArgument)\r
+               {\r
+                       if (CausesValidation)\r
                                Page.Validate();\r
-                       }\r
-                       OnServerClick(new ImageClickEventArgs(_x,_y));\r
+                       OnServerClick (new ImageClickEventArgs(_x, _y));\r
                }\r
                \r
-               public void RaisePostDataChangedEvent(){}\r
+               void IPostBackDataHandler.RaisePostDataChangedEvent ()\r
+               {\r
+               }\r
                \r
                public event EventHandler ServerClick{\r
                        add{\r
index 780988a8bf11d84bfef4b72cebf0b64f1318335a..0bc3ee4c97a3b129dca7915ba4e1676e6eddaa6c 100755 (executable)
@@ -4,13 +4,15 @@
 */\r
 \r
 using System;\r
+using System.Collections.Specialized;\r
+using System.ComponentModel;\r
+using System.Globalization;\r
 using System.Web;\r
 using System.Web.UI;\r
-using System.Globalization;\r
-using System.Collections.Specialized;\r
 \r
 namespace System.Web.UI.HtmlControls{\r
        \r
+       [DefaultEvent("ServerChange")]\r
        public class HtmlInputRadioButton : HtmlInputControl, IPostBackDataHandler{\r
                \r
                private static readonly object EventServerChange;\r
@@ -26,7 +28,7 @@ namespace System.Web.UI.HtmlControls{
                        }\r
                }\r
                \r
-               protected void OnServerChange(EventArgs e){\r
+               protected virtual void OnServerChange(EventArgs e){\r
                        EventHandler handler = (EventHandler) Events[EventServerChange];\r
                        if (handler != null){\r
                                handler.Invoke(this, e);\r
@@ -39,17 +41,18 @@ namespace System.Web.UI.HtmlControls{
                        base.RenderAttributes(writer);\r
                }\r
                \r
-               public bool LoadPostData(string postDataKey, NameValueCollection postCollection){\r
-                       string postValue = postCollection[postDataKey];\r
+               bool IPostBackDataHandler.LoadPostData (string postDataKey,\r
+                                                       NameValueCollection postCollection)\r
+               {\r
+                       string postValue = postCollection [postDataKey];\r
                        bool myBool = false;\r
-                       if (postValue != null && postValue.Equals(Value)){\r
-                               if (!Checked){\r
+                       if (postValue != null && postValue.Equals (Value)) {\r
+                               if (!Checked) {\r
                                        Checked = true;\r
                                        myBool = true;\r
                                }\r
-                       }\r
-                       else{\r
-                               if (Checked){\r
+                       } else {\r
+                               if (Checked) {\r
                                        Checked = false;\r
                                        myBool = false;\r
                                }\r
@@ -57,8 +60,9 @@ namespace System.Web.UI.HtmlControls{
                        return myBool;\r
                }\r
                \r
-               public void RaisePostDataChangedEvent(){\r
-                       OnServerChange(EventArgs.Empty);\r
+               void IPostBackDataHandler.RaisePostDataChangedEvent ()\r
+               {\r
+                       OnServerChange (EventArgs.Empty);\r
                }\r
                \r
                public event EventHandler ServerChange{\r
index 355743c52332e1398af00fc177400896cdd51c2e..bbeeb833051de7c3471e8eb19cb43ccff0cf5ccd 100755 (executable)
@@ -4,13 +4,15 @@
 */\r
 \r
 using System;\r
+using System.Collections.Specialized;\r
+using System.ComponentModel;\r
+using System.Globalization;\r
 using System.Web;\r
 using System.Web.UI;\r
-using System.Globalization;\r
-using System.Collections.Specialized;\r
 \r
 namespace System.Web.UI.HtmlControls{\r
        \r
+       [DefaultEvent("ServerChange")]\r
        public class HtmlInputText : HtmlInputControl, IPostBackDataHandler{\r
                \r
                private static readonly object EventServerChange;\r
@@ -24,9 +26,10 @@ namespace System.Web.UI.HtmlControls{
                        }\r
                }\r
                \r
-               protected void OnServerChange(EventArgs e){\r
-                       EventHandler handler = (EventHandler) Events[EventServerChange];\r
-                       if (handler != null) handler.Invoke(this, e);\r
+               protected virtual void OnServerChange (EventArgs e)\r
+               {\r
+                       EventHandler handler = (EventHandler) Events [EventServerChange];\r
+                       if (handler != null) handler (this, e);\r
                }\r
                \r
                protected override void RenderAttributes(HtmlTextWriter writer){\r
@@ -36,18 +39,21 @@ namespace System.Web.UI.HtmlControls{
                        base.RenderAttributes(writer);\r
                }\r
                \r
-               public bool LoadPostData(string postDataKey, NameValueCollection postCollection){\r
+               bool IPostBackDataHandler.LoadPostData (string postDataKey,\r
+                                                       NameValueCollection postCollection)\r
+               {\r
                        string currentValue = Value;\r
-                       string[] postedValue = postCollection.GetValues(postDataKey);\r
-                       if (!currentValue.Equals(postedValue)){\r
-                               Value = postedValue[0];\r
+                       string[] postedValue = postCollection.GetValues (postDataKey);\r
+                       if (!currentValue.Equals (postedValue)){\r
+                               Value = postedValue [0];\r
                                return true;\r
                        }\r
                        return false;\r
                }\r
                \r
-               public void RaisePostDataChangedEvent(){\r
-                       OnServerChange(EventArgs.Empty);\r
+               void IPostBackDataHandler.RaisePostDataChangedEvent ()\r
+               {\r
+                       OnServerChange (EventArgs.Empty);\r
                }\r
                \r
                public event EventHandler ServerChange{\r
index 4fd11f8f6fb650ade644b70221f78d4185622166..f146009ed30401e6c83db7e81594d060413871da 100755 (executable)
@@ -14,6 +14,7 @@ using System.Collections.Specialized;
 \r
 namespace System.Web.UI.HtmlControls{\r
        \r
+       [DefaultEvent("ServerChange")]\r
        public class HtmlSelect : HtmlContainerControl, IPostBackDataHandler{\r
                \r
                \r
@@ -171,7 +172,9 @@ namespace System.Web.UI.HtmlControls{
                        }\r
                }\r
                \r
-               public bool LoadPostData(string postDataKey, NameValueCollection postCollection){\r
+               bool IPostBackDataHandler.LoadPostData (string postDataKey,\r
+                                                       NameValueCollection postCollection)\r
+               {\r
                        //get the posted selectedIndices[]\r
                        string[] postedValueColl = postCollection.GetValues(postDataKey);\r
                        bool valid = false;\r
@@ -212,12 +215,13 @@ namespace System.Web.UI.HtmlControls{
                        return valid;\r
                }\r
                \r
-               public void RaisePostDataChangedEvent(){\r
-                       OnServerChange(EventArgs.Empty);\r
+               void IPostBackDataHandler.RaisePostDataChangedEvent ()\r
+               {\r
+                       OnServerChange (EventArgs.Empty);\r
                }\r
                \r
                //starts tracking changes to the viewstate\r
-               internal virtual new void TrackViewState(){\r
+               protected override void TrackViewState(){\r
                        TrackViewState();\r
                        Items.TrackViewState();\r
                }\r
index 6a70743c2d0b5dc6a61350ad305913f25e20ec4b..9240b7fcc5590bdb6f685ff8a4163f147afa42ca 100755 (executable)
@@ -10,6 +10,7 @@ using System.Globalization;
 \r
 namespace System.Web.UI.HtmlControls{\r
        \r
+       [ParseChildren(true, "Rows")]\r
        public class HtmlTable : HtmlContainerControl {\r
                private HtmlTableRowCollection _rows;\r
                \r
index 38d77f4f4715772bf5939a9866c2f7a67868dde7..d07346b35e03d7269838ee849c16e4c7877320bb 100755 (executable)
@@ -9,6 +9,7 @@ using System.Web.UI;
 using System.Globalization;\r
 \r
 namespace System.Web.UI.HtmlControls{\r
+       [ConstructorNeedsTag]\r
        public class HtmlTableCell : HtmlContainerControl {\r
                public HtmlTableCell(): base("td"){}\r
                \r
index f08f657ee0c9cb474060c87ffa23f27ce77168ee..84d6b2c81b974aefd2c01c13d22e8843fea7b28d 100755 (executable)
@@ -8,6 +8,7 @@ using System.Web;
 using System.Web.UI;\r
 \r
 namespace System.Web.UI.HtmlControls{\r
+       [ParseChildren(true, "Cells")]\r
        public class HtmlTableRow : HtmlContainerControl {\r
                private HtmlTableCellCollection _cells;\r
                public HtmlTableRow():base("tr"){}\r
index 9d32d73af0ea82375d63a1c817e06ed34e4b9d23..0f0775d1abaa8fada771aec5a7276544f3a64ec6 100644 (file)
@@ -12,6 +12,7 @@ using System.Collections.Specialized;
 \r
 namespace System.Web.UI.HtmlControls{\r
        \r
+       [DefaultEvent("ServerChange")]\r
        public class HtmlTextArea : HtmlContainerControl, IPostBackDataHandler{\r
                \r
                private static readonly object EventServerChange;\r
@@ -80,7 +81,9 @@ namespace System.Web.UI.HtmlControls{
                        }\r
                }\r
                \r
-               public bool LoadPostData(string postDataKey, NameValueCollection postCollection){\r
+               bool IPostBackDataHandler.LoadPostData (string postDataKey,\r
+                                                       NameValueCollection postCollection)\r
+               {\r
                        string currentValue = Value;\r
                        string postedValue = postCollection[postDataKey];\r
                        if (!currentValue.Equals(postedValue) && currentValue != null){\r
@@ -96,8 +99,9 @@ namespace System.Web.UI.HtmlControls{
                        base.RenderAttributes(writer);\r
                }\r
                \r
-               public void RaisePostDataChangedEvent(){\r
-                       OnServerChange(EventArgs.Empty);\r
+               void IPostBackDataHandler.RaisePostDataChangedEvent ()\r
+               {\r
+                       OnServerChange (EventArgs.Empty);\r
                }\r
                \r
                protected override void OnPreRender(EventArgs e){\r
index b7bacbbdb3df05fa9d6afd0b5dbb2315f1693ee8..cb7f52feb2f13e13d2d161032b32848ca8f2c3ca 100644 (file)
@@ -1,3 +1,14 @@
+2002-06-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * System.Web.UI/LiteralControl.cs: 
+       Fixes based on class status page:
+       
+               - Add attributes (DefaultEvent, ParseChildren).
+               - Fix declarations.
+               - Explicitly implement some interfaces (IPostBackDataHandler
+               and IPostBackEventHandler).
+               - Implemented some missing methods.
+
 2002-06-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * Control.cs: reimplemented FindControls.
index 180c700dc9a9033623996f636363b405a27e4a15..7a3ef1d0a7a3e04456604051d98f57d69c55db3d 100644 (file)
@@ -35,5 +35,10 @@ namespace System.Web.UI
                 {\r
                         writer.Write(_text);\r
                 }\r
+\r
+               protected override ControlCollection CreateControlCollection ()\r
+               {\r
+                       return new EmptyControlCollection (this);\r
+               }\r
         }\r
 }\r
index 0ce6120e4a2cdc0b4f60690d6e35f5e6c0bf03ea..2c08f76f5b94ebd82c4ecea68018d36b1dfe650f 100644 (file)
@@ -1,3 +1,15 @@
+2002-06-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * System.Web/HttpResponse.cs: 
+
+       Fixes based on class status page:
+       
+               - Add attributes (DefaultEvent, ParseChildren).
+               - Fix declarations.
+               - Explicitly implement some interfaces (IPostBackDataHandler
+               and IPostBackEventHandler).
+               - Implemented some missing methods.
+
 2002-06-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
 
        * HttpContext.cs:
index ea10cfd42ecb018c4038ebcf6f421abf66000976..2ba851807c14f8fdb9c30f2173a18b3dee9d9070 100644 (file)
@@ -349,7 +349,7 @@ namespace System.Web {
       }\r
 \r
       [MonoTODO("Set expiresabsolute in the cache policy")]\r
-      public int ExpiresAbsolute {\r
+      public DateTime ExpiresAbsolute {\r
          get {\r
             throw new NotImplementedException();\r
          }\r