Added PortletNamespace proerty

svn path=/trunk/mcs/; revision=71250

diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
index d63d616622aca7c9d8c5d54ba938126c25ae30fd..37cf363ed42589269978eee18af7df28ea18bae0 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-18  Eyal Alaluf <eyala@mainsoft.com>
+
+       * Control.jvm.cs: Added PortletNamespace property.
+
 2007-01-16  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
        * TemplateControl.jvm.cs: remover TemplateSourceDirectory propery
@@ -18,7 +22,7 @@
                                through the property 'Events', but currently we can't see
                                better implementation)
 
-2007-01-14  Eya; Alaluf <eyala@mainsoft.com>
+2007-01-14  Eyal Alaluf <eyala@mainsoft.com>
 
        * Control.jvm.cs, Page.jvm.cs: Added TARGET_J2EE specific files.
        * Page.cs, ClientScriptManager.cs, Control.cs: Added J2EE portal

diff --git a/mcs/class/System.Web/System.Web.UI/Control.jvm.cs b/mcs/class/System.Web/System.Web.UI/Control.jvm.cs
index fa106e41f6d1f9c2beaa780b91521de55bd8f88c..3eff19d50dd8ee460219004003e5c5698b83ca21 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/Control.jvm.cs
+++ b/mcs/class/System.Web/System.Web.UI/Control.jvm.cs
@@ -45,6 +45,22 @@ namespace System.Web.UI
                        }\r
                }\r
 \r
+               internal string PortletNamespace\r
+               {\r
+                       get {\r
+                               if (_emptyPortletNamespace)\r
+                                       return null;\r
+\r
+                               if (_PortletNamespace == null) {\r
+                                       IPortletResponse portletResponse = GetRenderResponse ();\r
+                                       if (portletResponse != null)\r
+                                               _PortletNamespace = portletResponse.getNamespace ();\r
+                                       _emptyPortletNamespace = _PortletNamespace == null;\r
+                               }\r
+                               return _PortletNamespace;\r
+                       }\r
+               }\r
+\r
                // For J2EE Portal we need to use the portlet namespace when we generate control IDs.\r
                string GetDefaultName ()\r
                {\r
@@ -55,17 +71,10 @@ namespace System.Web.UI
                                defaultName = defaultNameArray [defaultNumberID++];\r
                        }\r
 \r
-                       if (this != _page || _emptyPortletNamespace)\r
+                       if (this != _page)\r
                                return defaultName;\r
 \r
-                       if (_PortletNamespace == null) {\r
-                               IPortletResponse portletResponse = GetRenderResponse ();\r
-                               if (portletResponse != null)\r
-                                       _PortletNamespace = portletResponse.getNamespace ();\r
-                               _emptyPortletNamespace = _PortletNamespace == null;\r
-                       }\r
-\r
-                       return _PortletNamespace + defaultName;\r
+                       return PortletNamespace + defaultName;\r
                }\r
 \r
                // Add a variant for specifying use of portlet resolveRenderUrl\r