Use UNIX line endings consistently

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Parameter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Parameter.cs
index ff96dfd245232b782662607b4ace9287ebb65f2e..b69ec98e75ecf966b020b085945257543390c40b 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/Parameter.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Parameter.cs
@@ -121,17 +121,17 @@ namespace System.Web.UI.WebControls {
                        get { return this.IsTrackingViewState; }
                }
                
+               // MSDN: The ToString method returns the Name property of the Parameter object. If the Parameter object has no name, ToString returns String.Empty.
                public override string ToString ()
                {
                        return Name;
                }
                
-               [WebCategoryAttribute ("Parameter"), DefaultValueAttribute (""),
-               WebSysDescriptionAttribute ("Default value to be used in case value is null.") ]
+               [WebCategoryAttribute ("Parameter")]
+               [DefaultValueAttribute (null)]
+               [WebSysDescriptionAttribute ("Default value to be used in case value is null.")]
                public string DefaultValue {
-                       get {
-                               return ViewState ["DefaultValue"] as string;
-                       }
+                       get { return ViewState.GetString ("DefaultValue", null); }
                        set {
                                
                                if (DefaultValue != value) {
@@ -141,17 +141,12 @@ namespace System.Web.UI.WebControls {
                        }
                }
 
-               [WebCategoryAttribute ("Parameter"), DefaultValueAttribute ("Input"),
-               WebSysDescriptionAttribute ("Parameter's direction.")]
+               [WebCategoryAttribute ("Parameter")]
+               [DefaultValueAttribute ("Input")]
+               [WebSysDescriptionAttribute ("Parameter's direction.")]
                public ParameterDirection Direction
                {
-                       get {
-                               object o = ViewState ["Direction"];
-                               if (o != null)
-                                       return (ParameterDirection) o;
-                               
-                               return ParameterDirection.Input;
-                       }
+                       get { return (ParameterDirection) ViewState.GetInt ("Direction", (int)ParameterDirection.Input); }
                        set {                           
                                if (Direction != value) {
                                        ViewState ["Direction"] = value;
@@ -161,8 +156,9 @@ namespace System.Web.UI.WebControls {
                }
 
 
-               [WebCategoryAttribute ("Parameter"), DefaultValueAttribute (""),
-               WebSysDescriptionAttribute ("Parameter's name.")]
+               [WebCategoryAttribute ("Parameter")]
+               [DefaultValueAttribute ("")]
+               [WebSysDescriptionAttribute ("Parameter's name.")]
                public string Name
                {
                        get {
@@ -181,17 +177,12 @@ namespace System.Web.UI.WebControls {
                        }
                }
 
-               [WebCategoryAttribute ("Parameter"), DefaultValueAttribute (true),
-               WebSysDescriptionAttribute ("Checks whether an empty string is treated as a null value.")]
+               [WebCategoryAttribute ("Parameter")]
+               [DefaultValueAttribute (true)]
+               [WebSysDescriptionAttribute ("Checks whether an empty string is treated as a null value.")]
                public bool ConvertEmptyStringToNull
                {
-                       get {
-                               object o = ViewState["ConvertEmptyStringToNull"];
-                               if (o != null)
-                                       return (bool) o;
-                               
-                               return true;
-                       }
+                       get { return ViewState.GetBool ("ConvertEmptyStringToNull", true); }
                        set {
                                if (ConvertEmptyStringToNull != value) {
                                        ViewState["ConvertEmptyStringToNull"] = value;
@@ -200,18 +191,23 @@ namespace System.Web.UI.WebControls {
                        }
                }
 
-           [DefaultValueAttribute (TypeCode.Object)]
+               [DefaultValue (0)]
+               public int Size {
+                       get { return ViewState.GetInt ("Size", 0); }
+                       set {
+                               if (Size != value) {
+                                       ViewState["Size"] = value;
+                                       OnParameterChanged ();
+                               }
+                       }
+               }
+
+               [DefaultValueAttribute (TypeCode.Empty)]
                [WebCategoryAttribute ("Parameter"), 
                WebSysDescriptionAttribute("Represents type of the parameter.")]
                public TypeCode Type
                {
-                       get {
-                               object o = ViewState ["Type"];
-                               if (o != null)
-                                       return (TypeCode) o;
-                               
-                               return TypeCode.Object;
-                       }
+                       get { return (TypeCode) ViewState.GetInt ("Type", (int)TypeCode.Empty); }
                        set {
                                
                                if (Type != value) {
@@ -222,7 +218,6 @@ namespace System.Web.UI.WebControls {
                }
                
                StateBag viewState;
-               
                [BrowsableAttribute (false), 
                DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility.Hidden)]
                protected StateBag ViewState {
@@ -241,32 +236,47 @@ namespace System.Web.UI.WebControls {
                        get { return isTrackingViewState; }
                }
 
+               // MSDN: The default implementation of the Evaluate method is to return 
+               // a null reference (Nothing in Visual Basic) in all cases. 
+               // Classes that derive from the Parameter class override the Evaluate method 
+               // to return an updated parameter value. For example, the ControlParameter object 
+               // returns the value of the control that it is bound to, while 
+               // the QueryStringParameter object retrieves the current name/value pair from 
+               // the HttpRequest object.
                protected virtual object Evaluate (HttpContext context, Control control)
                {
-                       return this.DefaultValue;
+                       return null;
                }
-               
-               internal object GetValue (HttpContext context, Control control)
+
+               internal void UpdateValue (HttpContext context, Control control)
                {
                        object oldValue = ViewState ["ParameterValue"];
-                       
-                       object newValue = ConvertValue (Evaluate (context, control));
-                       if (newValue == null)
-                               newValue = ConvertValue (DefaultValue);
+
+                       object newValue = Evaluate (context, control);
 
                        if (!object.Equals (oldValue, newValue)) {
                                ViewState ["ParameterValue"] = newValue;
                                OnParameterChanged ();
                        }
-                       return newValue;
+               }
+
+               internal object GetValue (HttpContext context, Control control)
+               {
+                       UpdateValue (context, control);
+
+                       object value = ConvertValue (ViewState ["ParameterValue"]);
+                       if (value == null)
+                               value = ConvertValue (DefaultValue);
+
+                       return value;
                }
                
-               object ConvertValue (object val)
+               internal object ConvertValue (object val)
                {
                        if (val == null) return null;
                        if (ConvertEmptyStringToNull && val.Equals (string.Empty))
                                return null;
-                       return Convert.ChangeType (val, Type);
+                       return Type != TypeCode.Empty ? Convert.ChangeType (val, Type) : val;
                }
                
                protected internal virtual void SetDirty()