New test.

[mono.git] / mcs / class / System.Web / System.Web.UI.WebControls / SessionParameter.cs

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SessionParameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SessionParameter.cs
index fa7441b0a9860f46a750c745656e09ea6fb85c1a..e56bfe1891f13ecea58219c52e99ff2df02414bb 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/SessionParameter.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/SessionParameter.cs
@@ -7,12 +7,36 @@
 // (C) 2003 Ben Maurer
 //
 
-#if NET_1_2
+//
+// 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
 using System.Collections;
 using System.Collections.Specialized;
 using System.Text;
+using System.ComponentModel;
 
 namespace System.Web.UI.WebControls {
+
+       [DefaultPropertyAttribute ("SessionField")]
        public class SessionParameter : Parameter {
 
                public SessionParameter () : base ()
@@ -39,14 +63,16 @@ namespace System.Web.UI.WebControls {
                        return new SessionParameter (this);
                }
                
-               protected override object Evaluate (Control control)
+               protected override object Evaluate (HttpContext ctx, Control control)
                {
-                       if (control == null || control.Page == null || control.Page.Session == null)
+                       if (control == null || ctx.Session == null)
                                return null;
                        
-                       return control.Page.Session [SessionField];
+                       return ctx.Session [SessionField];
                }
                
+               [DefaultValueAttribute ("")]
+               [WebCategoryAttribute ("Parameter")]
                public string SessionField {
                        get {
                                string s = ViewState ["SessionField"] as string;