Author: kostat
Date: 2007-07-22 11:41:51 -0400 (Sun, 22 Jul 2007)
New Revision: 82443

Modified:
   trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
   trunk/mcs/class/System.Web/System.Web.UI/Control.cs
   trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
   trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
   trunk/mcs/class/System.Web/Test/System.Web.UI/TemplateControlTest.cs
Log:
base AppRelativeTemplateSourceDirectory property on TemplateControl; implement 
special behavior of Control.TemplateControl for TemplateControl instances

Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog  2007-07-22 15:12:23 UTC 
(rev 82442)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog  2007-07-22 15:41:51 UTC 
(rev 82443)
@@ -1,3 +1,9 @@
+2007-07-22 Konstantin Triger <[EMAIL PROTECTED]>
+
+       * Control.cs, TemplateControl.cs: base 
AppRelativeTemplateSourceDirectory property
+               on TemplateControl; implement special behavior of 
Control.TemplateControl for
+               TemplateControl instances.
+
 2007-07-18  Marek Habersack  <[EMAIL PROTECTED]>
 
        * ControlBuilder.cs: on the 2.0 profile BindingContainerType

Modified: trunk/mcs/class/System.Web/System.Web.UI/Control.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2007-07-22 15:12:23 UTC 
(rev 82442)
+++ trunk/mcs/class/System.Web/System.Web.UI/Control.cs 2007-07-22 15:41:51 UTC 
(rev 82443)
@@ -177,12 +177,17 @@
                public string AppRelativeTemplateSourceDirectory 
                {
                        get {
-                               if (_appRelativeTemplateSourceDirectory != null 
&& !(this is MasterPage))
+                               if (_appRelativeTemplateSourceDirectory != null)
                                        return 
_appRelativeTemplateSourceDirectory;
 
-                               if (Parent != null)
-                                       return 
Parent.AppRelativeTemplateSourceDirectory;
+                               Control tc = TemplateControl;
+                               if (tc != null)
+                                       return 
tc.AppRelativeTemplateSourceDirectory;
 
+                               Control parent = Parent;
+                               if (parent != null)
+                                       return 
parent.AppRelativeTemplateSourceDirectory;
+
                                return "~/";
                        }
                        [EditorBrowsable (EditorBrowsableState.Never)]
@@ -387,16 +392,22 @@
                [DesignerSerializationVisibility 
(DesignerSerializationVisibility.Hidden)]
                public TemplateControl TemplateControl {
                        get {
-                               if (_templateControl != null)
-                                       return _templateControl;
-                               if (_parent != null)
-                                       return _parent.TemplateControl;
-                               return null;
+                               return TemplateControlInternal;
                        }
                        
                        [EditorBrowsable (EditorBrowsableState.Never)]
                        set { _templateControl = value; }
                }
+
+                       internal virtual TemplateControl 
TemplateControlInternal {
+                               get {
+                                       if (_templateControl != null)
+                                               return _templateControl;
+                                       if (_parent != null)
+                                               return _parent.TemplateControl;
+                                       return null;
+                               }
+                       }
 #endif         
 
 #if !TARGET_J2EE

Modified: trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs 2007-07-22 
15:12:23 UTC (rev 82442)
+++ trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.cs 2007-07-22 
15:41:51 UTC (rev 82443)
@@ -325,6 +325,10 @@
                        
                        return converter.ConvertFrom (localObject);
                }
+
+               internal override TemplateControl TemplateControlInternal {
+                       get { return this; }
+               }
 #endif
                
                [EditorBrowsable (EditorBrowsableState.Never)]

Modified: trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs     
2007-07-22 15:12:23 UTC (rev 82442)
+++ trunk/mcs/class/System.Web/System.Web.UI/TemplateControl.jvm.cs     
2007-07-22 15:41:51 UTC (rev 82443)
@@ -517,6 +517,10 @@
                        }
                }
 
+               internal override TemplateControl TemplateControlInternal {
+                       get { return this; }
+               }
+
                protected internal object Eval (string expression)
                {
                        return DataBinder.Eval (Page.GetDataItem (), 
expression);

Modified: trunk/mcs/class/System.Web/Test/System.Web.UI/TemplateControlTest.cs
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI/TemplateControlTest.cs        
2007-07-22 15:12:23 UTC (rev 82442)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI/TemplateControlTest.cs        
2007-07-22 15:41:51 UTC (rev 82443)
@@ -265,6 +265,14 @@
                        // The SetStringResourcePointer method is not intended 
                        // for use from within your code. 
                }
+
+               [Test]
+               public void TemplateControl_TemplateControl ()
+               {
+                       Assert.IsNull (new Control ().TemplateControl);
+                       PokerTemplateControl t = new PokerTemplateControl ();
+                       Assert.AreEqual (t, t.TemplateControl);
+               }
                
                [Test]
                public void TemplateControl_WriteUTF8ResourceString ()

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to