X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web%2FSystem.Web.UI%2FControlBuilder.cs;h=2f4c4348927244de465703100e3dc65d02819a88;hb=7ad5ba37f4b691e39ed2e58a91ed0df0778599d6;hp=d8d7fd746ebe6f03e0a7df39fca6ed6d9d4d41c2;hpb=3a6d4aec241a55a523ee58194e6f27a4ceeae2d6;p=mono.git

diff --git a/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs b/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
old mode 100755
new mode 100644
index d8d7fd746eb..2f4c4348927
--- a/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
@@ -6,8 +6,7 @@
 // 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
 //
 // (C) 2002, 2003 Ximian, Inc. (http://www.ximian.com)
-//
-
+// Copyright (C) 2005 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
@@ -29,15 +28,17 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
 using System.Collections;
 using System.CodeDom;
 using System.Reflection;
-using System.Web;
+using System.Security.Permissions;
 using System.Web.Compilation;
 
 namespace System.Web.UI {
 
+	// CAS
+	[AspNetHostingPermission (SecurityAction.LinkDemand, Level = AspNetHostingPermissionLevel.Minimal)]
+	[AspNetHostingPermission (SecurityAction.InheritanceDemand, Level = AspNetHostingPermissionLevel.Minimal)]
 	public class ControlBuilder
 	{
 		internal static BindingFlags flagsNoCase = BindingFlags.Public |
@@ -62,6 +63,7 @@ namespace System.Web.UI {
 
 		internal bool haveParserVariable;
 		internal CodeMemberMethod method;
+		internal CodeStatementCollection methodStatements;
 		internal CodeMemberMethod renderMethod;
 		internal int renderIndex;
 		internal bool isProperty;
@@ -152,7 +154,12 @@ namespace System.Web.UI {
 			}
 		}
 
-		internal Type BindingContainerType {
+#if NET_2_0
+		public
+#else
+		internal
+#endif
+		Type BindingContainerType {
 			get {
 				if (parentBuilder == null)
 					return typeof (Control);
@@ -171,6 +178,17 @@ namespace System.Web.UI {
 			}
 		}
 
+		internal TemplateBuilder ParentTemplateBuilder {
+			get {
+				if (parentBuilder == null)
+					return null;
+				else if (parentBuilder is TemplateBuilder)
+					return (TemplateBuilder) parentBuilder;
+				else
+					return parentBuilder.ParentTemplateBuilder;
+			}
+		}
+
 		protected TemplateParser Parser {
 			get { return parser; }
 		}
@@ -474,6 +492,25 @@ namespace System.Web.UI {
 				}
 			}
 		}
+#if NET_2_0
+		[MonoTODO ("unsure, lack documentation")]
+		public virtual object BuildObject ()
+		{
+			return CreateInstance ();
+		}
+
+		internal void ResetState()
+		{
+			haveParserVariable = false;
+
+			if (Children != null) {
+				foreach (object child in Children) {
+					ControlBuilder cb = child as ControlBuilder;
+					if (cb != null)
+						cb.ResetState ();
+				}
+			}
+		}
+#endif
 	}
 }
-