New tests.

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

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlContainerControl.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlContainerControl.cs
index a24d8ca6d71342918357cb110d8a7c6c921a655b..66d1881d64104da93c1c90871c6d34618689e9fb 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlContainerControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlContainerControl.cs
@@ -7,19 +7,36 @@
 //
 // (C) Bob Smith
 // (c) 2002 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;
 using System.ComponentModel;
+using System.Security.Permissions;
 using System.Text;
-using System.Web;
-using System.Web.UI;
 
 //LAMESPEC: The dox talk about HttpException but are very ambigious.
 //TODO: Check to see if Render really is overridden instead of a LiteralControl being added. It apears that this is the
 //case due to testing. Anything inside the block is overwritten by the content of this control, so it doesnt apear
 //to do anything with children.
-// a doc references this. add? protected override ControlCollection CreateControlCollection();
 
 //TODO: If Test.InnerText = Test.InnerHtml without ever assigning anything into InnerHtml, you get this:
 // Exception Details: System.Web.HttpException: Cannot get inner content of Message because the contents are not literal.
@@ -35,11 +52,16 @@ using System.Web.UI;
 
 namespace System.Web.UI.HtmlControls
 {
-       public abstract class HtmlContainerControl : HtmlControl{
-               
-               public HtmlContainerControl () : this ("span") {}
+       // CAS
+       [AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       [AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+       public abstract class HtmlContainerControl : HtmlControl
+       {
+               protected HtmlContainerControl () : this ("span")
+               {}
                
-               public HtmlContainerControl (string tag) : base(tag) {}
+               public HtmlContainerControl (string tag) : base(tag)
+               {}
 
                [HtmlControlPersistable (false)]
                [BrowsableAttribute(false)]
@@ -49,28 +71,28 @@ namespace System.Web.UI.HtmlControls
                        get {
                                if (Controls.Count == 0)
                                        return String.Empty;
-
-                               bool is_literal = true;
-                               StringBuilder text = new StringBuilder ();
-                               foreach (Control ctrl in Controls) {
+                               
+                               if (Controls.Count == 1) {
+                                       Control ctrl = Controls [0];
                                        LiteralControl lc = ctrl as LiteralControl;
-                                       if (lc == null) {
-                                               is_literal = false;
-                                               break;
-                                       }
-                                       text.Append (lc.Text);
-                               }
-                                       
-                               if (!is_literal)
-                                       throw new HttpException ("There is no literal content!");
+                                       if (lc != null)
+                                               return lc.Text;
 
-                               return text.ToString ();
+                                       DataBoundLiteralControl dblc = ctrl as DataBoundLiteralControl;
+                                       if (dblc != null)
+                                               return dblc.Text;
+                               }
+                               
+                               throw new HttpException ("There is no literal content!");
                        }
 
                        set {
                                Controls.Clear ();
                                Controls.Add (new LiteralControl (value));
-                               ViewState ["innerhtml"] = value;
+                               if (value == null)
+                                       ViewState.Remove ("innerhtml");
+                               else
+                                       ViewState ["innerhtml"] = value;
                        }
                }
 
@@ -88,7 +110,7 @@ namespace System.Web.UI.HtmlControls
                        }
                }
                
-               protected override void Render (HtmlTextWriter writer)
+               protected internal override void Render (HtmlTextWriter writer)
                {
                        RenderBeginTag (writer);
                        RenderChildren (writer);
@@ -106,6 +128,9 @@ namespace System.Web.UI.HtmlControls
                        base.RenderAttributes (writer);
                }
 
+               /* we need to override this because our base class
+                * (HtmlControl) returns an instance of
+                * EmptyControlCollection. */
                protected override ControlCollection CreateControlCollection ()
                {
                        return new ControlCollection (this);