merge from trunk revisions 58933, 58935, 58936

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

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolder.cs
index c2956f83432af22129cd19a09c5645ec6ac6e5be..8d6441db7cb3f609b560737f03215f487b65e470 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolder.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolder.cs
@@ -1,29 +1,37 @@
-/**\r
- * Namespace: System.Web.UI.WebControls\r
- * Class:     PlaceHolder\r
- *\r
- * Author:  Gaurav Vaish\r
- * Maintainer: gvaish@iitk.ac.in\r
- * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>\r
- * Implementation: yes\r
- * Status:  100%\r
- *\r
- * (C) Gaurav Vaish (2002)\r
- */\r
-\r
-using System;\r
-using System.ComponentModel;\r
-using System.Web;\r
-using System.Web.UI;\r
-\r
-namespace System.Web.UI.WebControls\r
-{\r
-       [ControlBuilder(typeof(PlaceHolderControlBuilder))]\r
-       [DefaultProperty("ID")]\r
-       public class PlaceHolder : Control\r
-       {\r
-               public PlaceHolder(): base()\r
-               {\r
-               }\r
-       }\r
-}\r
+//
+// System.Web.UI.WebControls.PlaceHolder.cs
+//
+// Authors:
+//     Ben Maurer (bmaurer@novell.com)
+//
+// (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// TODO: Are we missing something in LoadViewState?
+// What to do in AddParsedSubObject
+//
+// 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.
+//
+namespace System.Web.UI.WebControls {
+       [ControlBuilder (typeof (PlaceHolderControlBuilder))]
+       public class PlaceHolder : Control {
+               // Nada?
+       }
+       
+}