X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.UI.WebControls%2FRequiredFieldValidator.cs;h=607c742d5def22463ebcdc507787c6e910902ca5;hb=7bba17dd3ccf8fd6a9c42d92c04d5e90bb200cbf;hp=4f13793eea5367a43ef2a2c35f17ed7a15b9edc6;hpb=d1c09fcc674eb5bf479db2ba41d24c43ad3c6d4e;p=mono.git

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RequiredFieldValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RequiredFieldValidator.cs
index 4f13793eea5..607c742d5de 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/RequiredFieldValidator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RequiredFieldValidator.cs
@@ -1,4 +1,10 @@
-
+//
+// System.Web.UI.WebControls.RequiredFieldValidator
+//
+// Authors:
+//	Ben Maurer (bmaurer@novell.com)
+//
+// (C) 2005 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -19,67 +25,52 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-/**
- * Namespace: System.Web.UI.WebControls
- * Class:     RequiredFieldValidator
- *
- * Author:  Gaurav Vaish
- * Maintainer: gvaish@iitk.ac.in
- * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
- * Implementation: yes
- * Status:  100%
- *
- * (C) Gaurav Vaish (2002)
- */
 
-using System.ComponentModel;
-
-namespace System.Web.UI.WebControls
-{
-	[ToolboxData("<{0}:RequiredFieldValidator runat=\"server\" "
-	           + "ErrorMessage=\"RequiredFieldValidator\">"
-	           + "</{0}:RequiredFieldValidator>")]
-	public class RequiredFieldValidator : BaseValidator
-	{
-		public RequiredFieldValidator(): base()
-		{
-		}
+using System.ComponentModel;
+using System.Security.Permissions;
+
+namespace System.Web.UI.WebControls {
+	// CAS
+	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+	// attributes
+#if NET_2_0
+	[ToolboxData ("<{0}:RequiredFieldValidator runat=\"server\" ErrorMessage=\"RequiredFieldValidator\"></{0}:RequiredFieldValidator>")]
+#else
+	[ToolboxData ("<{0}:RequiredFieldValidator runat=server ErrorMessage=\"RequiredFieldValidator\"></{0}:RequiredFieldValidator>")]
+#endif
+	public class RequiredFieldValidator : BaseValidator {
+		protected override void AddAttributesToRender (HtmlTextWriter w)
+		{
+			if (RenderUplevel) {
+				w.AddAttribute ("evaluationfunction", "RequiredFieldValidatorEvaluateIsValid");
+				w.AddAttribute ("initialvalue", InitialValue);
+			}
+
+			base.AddAttributesToRender (w);
+		}
+		
+		protected override bool EvaluateIsValid ()
+		{
+			return GetControlValidationValue (ControlToValidate) != InitialValue;
+		}
+		
 
-		[DefaultValue (""), Bindable (true), WebCategory ("Behavior")]
-		[WebSysDescription ("The initial value for the required field.")]
-		public string InitialValue
-		{
-			get
-			{
-				object o = ViewState["InitialValue"];
-				if(o != null)
-					return (String)o;
-				return String.Empty;
-			}
-			set
-			{
-				ViewState["InitialValue"] = value;
-			}
-		}
-
-		protected override void AddAttributesToRender(HtmlTextWriter writer)
-		{
-			base.AddAttributesToRender(writer);
-			if(RenderUplevel)
-			{
-				writer.AddAttribute("evaluationfunction", "RequiredFieldValidatorEvaluateIsValid");
-				writer.AddAttribute("initialvalue", InitialValue);
-			}
-		}
-
-		protected override bool EvaluateIsValid()
-		{
-			string val = GetControlValidationValue(ControlToValidate);
-			if(val != null)
-			{
-				return (val.Trim() != InitialValue.Trim());
-			}
-			return true;
-		}
-	}
-}
+#if NET_2_0
+		[Themeable(false)]
+#else
+		[Bindable(true)]
+#endif
+		[DefaultValue("")]
+		[WebSysDescription ("")]
+		[WebCategory ("Behavior")]
+		public string InitialValue {
+			get {
+				return ViewState.GetString ("InitialValue", "");
+			}
+			set {
+				ViewState ["InitialValue"] = value;
+			}
+		}
+	}
+}