* PagedDataSource.cs (PrivateICollectionEnumerator.MoveNext):

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
index 8494f0182ca73b6db603b01bf59af06d2a3066b9..0dddee6728480cbd2d3296a4e1c7ae74e3d9571b 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
@@ -1,18 +1,18 @@
-/**
-* Namespace: System.Web.UI.WebControls
-* Class:     CompareValidator
-*
-* Author:  Gaurav Vaish
-* Maintainer: gvaish@iitk.ac.in
-* Implementation: yes
-* Status:  80%
-*
-* (C) Gaurav Vaish (2001)
-*/
+//
+// System.Web.UI.WebControls.CompareValidator.cs
+//
+// Authors:
+//   Gaurav Vaish (gvaish@iitk.ac.in)
+//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
+//
+// (C) Gaurav Vaish (2002)
+// (C) 2003 Andreas Nahr
+//
 
 using System;
 using System.Web;
 using System.Web.UI;
+using System.ComponentModel;
 
 namespace System.Web.UI.WebControls
 {
@@ -25,6 +25,9 @@ namespace System.Web.UI.WebControls
                        // Intitalize();
                }
 
+               [DefaultValue (""), WebCategory ("Behavior")]
+               [TypeConverter (typeof (ValidatedControlConverter))]
+               [WebSysDescription ("The ID of a control that is compared.")]
                public string ControlToCompare
                {
                        get
@@ -41,6 +44,8 @@ namespace System.Web.UI.WebControls
                        }
                }
 
+               [DefaultValue (typeof (ValidationCompareOperator), "Equal"), WebCategory ("Behavior")]
+               [WebSysDescription ("The operator that is used for comparison.")]
                public ValidationCompareOperator Operator
                {
                        get
@@ -58,6 +63,8 @@ namespace System.Web.UI.WebControls
                        }
                }
 
+               [DefaultValue (""), Bindable (true), WebCategory ("Behavior")]
+               [WebSysDescription ("The value that is compared to.")]
                public string ValueToCompare
                {
                        get
@@ -73,17 +80,20 @@ namespace System.Web.UI.WebControls
                        }
                }
 
-               protected override bool EvaluateIsValid()
+               protected override bool EvaluateIsValid ()
                {
-                       string ctrl = GetControlValidationValue(ControlToValidate);
-                       if(ctrl != null && ctrl.Length > 0)
-                       {
-                               string cmp = (ControlToCompare.Length > 0 ?
-                                             ControlToCompare : ValueToCompare);
-                               return BaseCompareValidator.Compare(ctrl, cmp,
-                                                                   Operator, Type);
+                       string ctrl = GetControlValidationValue (ControlToValidate);
+                       if (ctrl == null || ctrl.Length == 0)
+                               return true;
+
+                       string cmp;
+                       if (ControlToCompare.Length > 0) {
+                               cmp = GetControlValidationValue (ControlToCompare);
+                       } else {
+                               cmp = ValueToCompare;
                        }
-                       return true;
+
+                       return Compare (ctrl, cmp, Operator, Type);
                }
        }
 }