New tests.

[mono.git] / mcs / class / System.Web / System.Web.UI.HtmlControls / HtmlSelectBuilder.cs

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelectBuilder.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelectBuilder.cs
index d0d09a963ac61d31e8d0e204d94ac08f6024cf51..b4c8e726e07f85eb40913c74c18955d985f2fa3b 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelectBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelectBuilder.cs
@@ -5,15 +5,40 @@
 //     Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 // (C) 2003 Ximian, Inc (http://www.ximian.com)
+// Copyright (C) 2005-2010 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
+// "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.
 //
 
 using System.Collections;
-using System.Web.UI;
+using System.Security.Permissions;
 using System.Web.UI.WebControls;
+using System.Globalization;
+using System.Web.Util;
 
 namespace System.Web.UI.HtmlControls
 {
-       class HtmlSelectBuilder : ControlBuilder
+       // CAS
+       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       public class HtmlSelectBuilder : ControlBuilder
        {
                public override bool AllowWhitespaceLiterals () 
                {
@@ -22,9 +47,12 @@ namespace System.Web.UI.HtmlControls
 
                public override Type GetChildControlType (string tagName, IDictionary attribs) 
                {
-                       if (System.String.Compare (tagName, "option", true) != 0)
+                       if (String.Compare (tagName, "option", true, Helpers.InvariantCulture) != 0)
                                return null;
 
+                       string selected = attribs ["selected"] as string;
+                       if (selected != null && selected.Length > 0 && String.Compare (selected, "selected", true, Helpers.InvariantCulture) == 0)
+                               attribs ["selected"] = "true";
                        return typeof (ListItem);
                }
        }