diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2002-07-01 00:44:49 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2002-07-01 00:44:49 +0400 |
| commit | 129ad6efaa9361a7f21aae9c8528e203185b3786 (patch) | |
| tree | 9b404be5e161683905bb239fec7f70001ef712c1 /mcs | |
| parent | 246dc289a88f5f53886ab6dab7df7195cd8eacf0 (diff) | |
2002-06-30 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* 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
Diffstat (limited to 'mcs')
25 files changed, 250 insertions, 89 deletions
diff --git a/mcs/class/System.Web/System.Web.SessionState/ChangeLog b/mcs/class/System.Web/System.Web.SessionState/ChangeLog index 199a6ddd407..a34f93c7f6a 100644 --- a/mcs/class/System.Web/System.Web.SessionState/ChangeLog +++ b/mcs/class/System.Web/System.Web.SessionState/ChangeLog @@ -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. diff --git a/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.cs b/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.cs index 83ca50e4094..ed90f6bc0a0 100644 --- a/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.cs +++ b/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.cs @@ -49,6 +49,7 @@ public sealed class HttpSessionState : ICollection, IEnumerable public int CodePage { get { return 0; } + set { } } public HttpSessionState Contents diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog index 08e580fe840..a005cfc13f1 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog @@ -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: diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs index f469b7ee1c2..7b210c297aa 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs @@ -4,11 +4,13 @@ */
using System;
+using System.ComponentModel;
using System.Web;
using System.Web.UI;
namespace System.Web.UI.HtmlControls{
+ [DefaultEvent("ServerClick")]
public class HtmlAnchor : HtmlContainerControl, IPostBackEventHandler{
private static readonly object EventServerClick;
@@ -19,6 +21,11 @@ namespace System.Web.UI.HtmlControls{ public HtmlAnchor(): base("a"){}
+ protected override void OnPreRender (EventArgs e)
+ {
+ base.OnPreRender (e);
+ }
+
protected virtual void OnServerClick(EventArgs e){
EventHandler handler;
handler = (EventHandler) Events[EventServerClick];
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlButton.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlButton.cs index b926ef0f184..266f5a873b5 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlButton.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlButton.cs @@ -4,11 +4,13 @@ */
using System;
+using System.ComponentModel;
using System.Web;
using System.Web.UI;
namespace System.Web.UI.HtmlControls{
+ [DefaultEvent("ServerClick")]
public class HtmlButton : HtmlContainerControl, IPostBackEventHandler{
private static readonly object EventServerClick;
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs index 4907fabd9fd..3a830dc3d48 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs @@ -29,6 +29,11 @@ namespace System.Web.UI.HtmlControls{ if(tag != null && tag != String.Empty) _tagName = tag;
}
+ protected override ControlCollection CreateControlCollection ()
+ {
+ return new EmptyControlCollection (this);
+ }
+
internal static string AttributeToString(int n){
if (n != -1)return n.ToString(NumberFormatInfo.InvariantInfo);
return null;
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs index 73e7b5e898a..9c05d701a99 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs @@ -135,7 +135,7 @@ namespace System.Web.UI.HtmlControls{ }
}
- public string Name{
+ public virtual string Name{
get{
string attr = Attributes["name"];
if (attr != null){
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlGenericControl.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlGenericControl.cs index 619ad693642..e91265ed61a 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlGenericControl.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlGenericControl.cs @@ -1,23 +1,35 @@ -//
-// 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{
-
- public class HtmlGenericControl : HtmlContainerControl {
-
- public HtmlGenericControl(){}
-
- public HtmlGenericControl(string tag): base(tag){}
-
- }
- }
+// +// 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; } + } + } +} + diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs index d9e371a7f8a..75e6688670e 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs @@ -4,12 +4,14 @@ */
using System;
+using System.ComponentModel;
+using System.Globalization;
using System.Web;
using System.Web.UI;
-using System.Globalization;
namespace System.Web.UI.HtmlControls{
+ [DefaultEvent("ServerClick")]
public class HtmlInputButton : HtmlInputControl, IPostBackEventHandler{
private static readonly object EventServerClick;
@@ -20,14 +22,25 @@ namespace System.Web.UI.HtmlControls{ public HtmlInputButton(string type): base(type){}
- protected void OnServerClick(EventArgs e){
+ protected override void OnPreRender (EventArgs e)
+ {
+ base.OnPreRender(e);
+ }
+
+ protected override void RenderAttributes (HtmlTextWriter writer)
+ {
+ base.RenderAttributes (writer);
+ }
+
+ protected virtual void OnServerClick(EventArgs e){
EventHandler handler = (EventHandler) Events[EventServerClick];
if (handler != null){
handler.Invoke(this, e);
}
}
- public void RaisePostBackEvent(string eventArgument){
+ void IPostBackEventHandler.RaisePostBackEvent (string eventArgument)
+ {
if(CausesValidation == true){
Page.Validate();
}
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputCheckBox.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputCheckBox.cs index c73915abc15..f93e60a6a61 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputCheckBox.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputCheckBox.cs @@ -4,33 +4,45 @@ */
using System;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
using System.Web;
using System.Web.UI;
-using System.Globalization;
-using System.Collections.Specialized;
namespace System.Web.UI.HtmlControls{
+ [DefaultEvent("ServerChange")]
public class HtmlInputCheckBox : HtmlInputControl, IPostBackDataHandler{
private static readonly object EventServerChange;
public HtmlInputCheckBox(): base("checkbox"){}
- public bool LoadPostData(string postDataKey, NameValueCollection postCollection){
- string postValue = postCollection[postDataKey];
+ bool IPostBackDataHandler.LoadPostData (string postDataKey,
+ NameValueCollection postCollection)
+ {
+ string postValue = postCollection [postDataKey];
bool postChecked = false;
+ bool retval = false;
+
if (postValue != null)
postChecked = postValue.Length > 0;
- Checked = postChecked;
- return (postChecked == Checked == false);
+
+ if (Checked != postChecked){
+ retval = true;
+ Checked = postChecked;
+ }
+
+ return retval;
}
- public void RaisePostDataChangedEvent(){
- OnServerChange(EventArgs.Empty);
+ void IPostBackDataHandler.RaisePostDataChangedEvent ()
+ {
+ OnServerChange (EventArgs.Empty);
}
- protected void OnServerChange(EventArgs e){
+ protected virtual void OnServerChange(EventArgs e){
EventHandler handler = (EventHandler) Events[EventServerChange];
if (handler != null) handler.Invoke(this, e);
}
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputControl.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputControl.cs index 5d4a6ce95c7..aeb0b539a4f 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputControl.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputControl.cs @@ -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 { diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputFile.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputFile.cs index b0e4710db6a..acd09293a44 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputFile.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputFile.cs @@ -15,14 +15,18 @@ namespace System.Web.UI.HtmlControls{ public HtmlInputFile():base("file"){}
- public virtual bool LoadPostData(string postDataKey, NameValueCollection postCollection){
- string postValue = postCollection[postDataKey];
+ bool IPostBackDataHandler.LoadPostData (string postDataKey,
+ NameValueCollection postCollection)
+ {
+ string postValue = postCollection [postDataKey];
if (postValue != null)
Value = postValue;
return false;
}
- public virtual void RaisePostDataChangedEvent(){}
+ void IPostBackDataHandler.RaisePostDataChangedEvent ()
+ {
+ }
public string Accept{
get{
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputHidden.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputHidden.cs index b2ff1bfdba8..2a3dce63faf 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputHidden.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputHidden.cs @@ -4,13 +4,15 @@ */
using System;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
using System.Web;
using System.Web.UI;
-using System.Globalization;
-using System.Collections.Specialized;
namespace System.Web.UI.HtmlControls{
+ [DefaultEvent("ServerChange")]
public class HtmlInputHidden : HtmlInputControl, IPostBackDataHandler{
private static readonly object EventServerChange;
@@ -19,20 +21,24 @@ namespace System.Web.UI.HtmlControls{ {
}
- public bool LoadPostData(string postDataKey, NameValueCollection postCollection){
- string postValue = postCollection[postDataKey];
+ bool IPostBackDataHandler.LoadPostData (string postDataKey,
+ NameValueCollection postCollection)
+ {
+ string postValue = postCollection [postDataKey];
if (postValue != null)
Value = postValue;
return false;
}
- public virtual void RaisePostDataChangedEvent(){
- OnServerChange(EventArgs.Empty);
+ void IPostBackDataHandler.RaisePostDataChangedEvent ()
+ {
+ // don't need anything. LoadPostData always returns false.
}
- protected void OnServerChange(EventArgs e){
- EventHandler handler = (EventHandler) Events[EventServerChange];
- if (handler != null) handler.Invoke(this, e);
+ protected virtual void OnServerChange (EventArgs e)
+ {
+ EventHandler handler = (EventHandler) Events [EventServerChange];
+ if (handler != null) handler.Invoke (this, e);
}
protected override void OnPreRender(EventArgs e){
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs index 1854a3b4dd2..b8e5f38face 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs @@ -24,12 +24,20 @@ namespace System.Web.UI.HtmlControls{ }
}
- protected void OnServerClick(ImageClickEventArgs e){
+ protected override void RenderAttributes(HtmlTextWriter writer)
+ {
+ base.RenderAttributes (writer);
+ // Anything else?
+ }
+
+ protected virtual void OnServerClick(ImageClickEventArgs e){
ImageClickEventHandler handler = (ImageClickEventHandler) Events[EventServerClick];
- // if (handler != null) handler.Invoke(this, e);
+ if (handler != null) handler (this, e);
}
- public bool LoadPostData(string postDataKey, NameValueCollection postCollection){
+ bool IPostBackDataHandler.LoadPostData (string postDataKey,
+ NameValueCollection postCollection)
+ {
string postX = postCollection[String.Concat(RenderedName,".x")];
string postY = postCollection[String.Concat(RenderedName,".y")];
if (postX != null && postY != null && postX.Length >= 0 && postY.Length >= 0){
@@ -40,14 +48,16 @@ namespace System.Web.UI.HtmlControls{ return false;
}
- public void RaisePostBackEvent(string eventArgument){
- if (CausesValidation){
+ void IPostBackEventHandler.RaisePostBackEvent (string eventArgument)
+ {
+ if (CausesValidation)
Page.Validate();
- }
- OnServerClick(new ImageClickEventArgs(_x,_y));
+ OnServerClick (new ImageClickEventArgs(_x, _y));
}
- public void RaisePostDataChangedEvent(){}
+ void IPostBackDataHandler.RaisePostDataChangedEvent ()
+ {
+ }
public event EventHandler ServerClick{
add{
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs index 780988a8bf1..0bc3ee4c97a 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs @@ -4,13 +4,15 @@ */
using System;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
using System.Web;
using System.Web.UI;
-using System.Globalization;
-using System.Collections.Specialized;
namespace System.Web.UI.HtmlControls{
+ [DefaultEvent("ServerChange")]
public class HtmlInputRadioButton : HtmlInputControl, IPostBackDataHandler{
private static readonly object EventServerChange;
@@ -26,7 +28,7 @@ namespace System.Web.UI.HtmlControls{ }
}
- protected void OnServerChange(EventArgs e){
+ protected virtual void OnServerChange(EventArgs e){
EventHandler handler = (EventHandler) Events[EventServerChange];
if (handler != null){
handler.Invoke(this, e);
@@ -39,17 +41,18 @@ namespace System.Web.UI.HtmlControls{ base.RenderAttributes(writer);
}
- public bool LoadPostData(string postDataKey, NameValueCollection postCollection){
- string postValue = postCollection[postDataKey];
+ bool IPostBackDataHandler.LoadPostData (string postDataKey,
+ NameValueCollection postCollection)
+ {
+ string postValue = postCollection [postDataKey];
bool myBool = false;
- if (postValue != null && postValue.Equals(Value)){
- if (!Checked){
+ if (postValue != null && postValue.Equals (Value)) {
+ if (!Checked) {
Checked = true;
myBool = true;
}
- }
- else{
- if (Checked){
+ } else {
+ if (Checked) {
Checked = false;
myBool = false;
}
@@ -57,8 +60,9 @@ namespace System.Web.UI.HtmlControls{ return myBool;
}
- public void RaisePostDataChangedEvent(){
- OnServerChange(EventArgs.Empty);
+ void IPostBackDataHandler.RaisePostDataChangedEvent ()
+ {
+ OnServerChange (EventArgs.Empty);
}
public event EventHandler ServerChange{
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputText.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputText.cs index 355743c5233..bbeeb833051 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputText.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputText.cs @@ -4,13 +4,15 @@ */
using System;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Globalization;
using System.Web;
using System.Web.UI;
-using System.Globalization;
-using System.Collections.Specialized;
namespace System.Web.UI.HtmlControls{
+ [DefaultEvent("ServerChange")]
public class HtmlInputText : HtmlInputControl, IPostBackDataHandler{
private static readonly object EventServerChange;
@@ -24,9 +26,10 @@ namespace System.Web.UI.HtmlControls{ }
}
- protected void OnServerChange(EventArgs e){
- EventHandler handler = (EventHandler) Events[EventServerChange];
- if (handler != null) handler.Invoke(this, e);
+ protected virtual void OnServerChange (EventArgs e)
+ {
+ EventHandler handler = (EventHandler) Events [EventServerChange];
+ if (handler != null) handler (this, e);
}
protected override void RenderAttributes(HtmlTextWriter writer){
@@ -36,18 +39,21 @@ namespace System.Web.UI.HtmlControls{ base.RenderAttributes(writer);
}
- public bool LoadPostData(string postDataKey, NameValueCollection postCollection){
+ bool IPostBackDataHandler.LoadPostData (string postDataKey,
+ NameValueCollection postCollection)
+ {
string currentValue = Value;
- string[] postedValue = postCollection.GetValues(postDataKey);
- if (!currentValue.Equals(postedValue)){
- Value = postedValue[0];
+ string[] postedValue = postCollection.GetValues (postDataKey);
+ if (!currentValue.Equals (postedValue)){
+ Value = postedValue [0];
return true;
}
return false;
}
- public void RaisePostDataChangedEvent(){
- OnServerChange(EventArgs.Empty);
+ void IPostBackDataHandler.RaisePostDataChangedEvent ()
+ {
+ OnServerChange (EventArgs.Empty);
}
public event EventHandler ServerChange{
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs index 4fd11f8f6fb..f146009ed30 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs @@ -14,6 +14,7 @@ using System.Collections.Specialized; namespace System.Web.UI.HtmlControls{
+ [DefaultEvent("ServerChange")]
public class HtmlSelect : HtmlContainerControl, IPostBackDataHandler{
@@ -171,7 +172,9 @@ namespace System.Web.UI.HtmlControls{ }
}
- public bool LoadPostData(string postDataKey, NameValueCollection postCollection){
+ bool IPostBackDataHandler.LoadPostData (string postDataKey,
+ NameValueCollection postCollection)
+ {
//get the posted selectedIndices[]
string[] postedValueColl = postCollection.GetValues(postDataKey);
bool valid = false;
@@ -212,12 +215,13 @@ namespace System.Web.UI.HtmlControls{ return valid;
}
- public void RaisePostDataChangedEvent(){
- OnServerChange(EventArgs.Empty);
+ void IPostBackDataHandler.RaisePostDataChangedEvent ()
+ {
+ OnServerChange (EventArgs.Empty);
}
//starts tracking changes to the viewstate
- internal virtual new void TrackViewState(){
+ protected override void TrackViewState(){
TrackViewState();
Items.TrackViewState();
}
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTable.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTable.cs index 6a70743c2d0..9240b7fcc55 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTable.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTable.cs @@ -10,6 +10,7 @@ using System.Globalization; namespace System.Web.UI.HtmlControls{
+ [ParseChildren(true, "Rows")]
public class HtmlTable : HtmlContainerControl {
private HtmlTableRowCollection _rows;
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableCell.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableCell.cs index 38d77f4f471..d07346b35e0 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableCell.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableCell.cs @@ -9,6 +9,7 @@ using System.Web.UI; using System.Globalization;
namespace System.Web.UI.HtmlControls{
+ [ConstructorNeedsTag]
public class HtmlTableCell : HtmlContainerControl {
public HtmlTableCell(): base("td"){}
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableRow.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableRow.cs index f08f657ee0c..84d6b2c81b9 100755 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableRow.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableRow.cs @@ -8,6 +8,7 @@ using System.Web; using System.Web.UI;
namespace System.Web.UI.HtmlControls{
+ [ParseChildren(true, "Cells")]
public class HtmlTableRow : HtmlContainerControl {
private HtmlTableCellCollection _cells;
public HtmlTableRow():base("tr"){}
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTextArea.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTextArea.cs index 9d32d73af0e..0f0775d1aba 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTextArea.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTextArea.cs @@ -12,6 +12,7 @@ using System.Collections.Specialized; namespace System.Web.UI.HtmlControls{
+ [DefaultEvent("ServerChange")]
public class HtmlTextArea : HtmlContainerControl, IPostBackDataHandler{
private static readonly object EventServerChange;
@@ -80,7 +81,9 @@ namespace System.Web.UI.HtmlControls{ }
}
- public bool LoadPostData(string postDataKey, NameValueCollection postCollection){
+ bool IPostBackDataHandler.LoadPostData (string postDataKey,
+ NameValueCollection postCollection)
+ {
string currentValue = Value;
string postedValue = postCollection[postDataKey];
if (!currentValue.Equals(postedValue) && currentValue != null){
@@ -96,8 +99,9 @@ namespace System.Web.UI.HtmlControls{ base.RenderAttributes(writer);
}
- public void RaisePostDataChangedEvent(){
- OnServerChange(EventArgs.Empty);
+ void IPostBackDataHandler.RaisePostDataChangedEvent ()
+ {
+ OnServerChange (EventArgs.Empty);
}
protected override void OnPreRender(EventArgs e){
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index b7bacbbdb3d..cb7f52feb2f 100644 --- a/mcs/class/System.Web/System.Web.UI/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI/ChangeLog @@ -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. diff --git a/mcs/class/System.Web/System.Web.UI/LiteralControl.cs b/mcs/class/System.Web/System.Web.UI/LiteralControl.cs index 180c700dc9a..7a3ef1d0a7a 100644 --- a/mcs/class/System.Web/System.Web.UI/LiteralControl.cs +++ b/mcs/class/System.Web/System.Web.UI/LiteralControl.cs @@ -35,5 +35,10 @@ namespace System.Web.UI {
writer.Write(_text);
}
+
+ protected override ControlCollection CreateControlCollection ()
+ {
+ return new EmptyControlCollection (this);
+ }
}
}
diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog index 0ce6120e4a2..2c08f76f5b9 100644 --- a/mcs/class/System.Web/System.Web/ChangeLog +++ b/mcs/class/System.Web/System.Web/ChangeLog @@ -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: diff --git a/mcs/class/System.Web/System.Web/HttpResponse.cs b/mcs/class/System.Web/System.Web/HttpResponse.cs index ea10cfd42ec..2ba851807c1 100644 --- a/mcs/class/System.Web/System.Web/HttpResponse.cs +++ b/mcs/class/System.Web/System.Web/HttpResponse.cs @@ -349,7 +349,7 @@ namespace System.Web { }
[MonoTODO("Set expiresabsolute in the cache policy")]
- public int ExpiresAbsolute {
+ public DateTime ExpiresAbsolute {
get {
throw new NotImplementedException();
}
|