2010-05-12 Marek Habersack <mhabersack@novell.com>

[mono.git] / mcs / class / System.ComponentModel.DataAnnotations / System.ComponentModel.DataAnnotations / RequiredAttribute.cs

diff --git a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RequiredAttribute.cs b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RequiredAttribute.cs
index 645986d9c8577da25e23558f76aa08fc8b8135c9..46318de5d4e8db9d7939da3530d61480e5375e83 100644 (file)
--- a/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RequiredAttribute.cs
+++ b/mcs/class/System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations/RequiredAttribute.cs
@@ -4,7 +4,7 @@
 // Author:
 //     Atsushi Enomoto <atsushi@ximian.com>
 //
-// Copyright (C) 2008 Novell Inc. http://novell.com
+// Copyright (C) 2008-2010 Novell Inc. http://novell.com
 //
 
 //
@@ -35,10 +35,24 @@ namespace System.ComponentModel.DataAnnotations
        [AttributeUsage (AttributeTargets.Property|AttributeTargets.Field, AllowMultiple = false)]
        public class RequiredAttribute : ValidationAttribute
        {
-               [MonoTODO]
+#if NET_4_0
+               public bool AllowEmptyStrings { get; set; }
+#endif
+
                public override bool IsValid (object value)
                {
-                       throw new NotImplementedException ();
+                       if (value == null)
+                               return false;
+
+                       string s = value as string;
+                       if (s != null
+#if NET_4_0
+                           && !AllowEmptyStrings
+#endif
+                       )
+                               return s.Length > 0;
+
+                       return true;
                }
        }
 }