From 6773a64fcb56809b8ebc93767181ebb0cf9a3a45 Mon Sep 17 00:00:00 2001 From: Eyal Alalouf Date: Thu, 18 Jan 2007 10:57:54 +0000 Subject: [PATCH] Added PortletNamespace proerty svn path=/trunk/mcs/; revision=71250 --- mcs/class/System.Web/System.Web.UI/ChangeLog | 6 ++++- .../System.Web/System.Web.UI/Control.jvm.cs | 27 ++++++++++++------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index d63d616622a..37cf363ed42 100644 --- 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 + + * Control.jvm.cs: Added PortletNamespace property. + 2007-01-16 Vladimir Krasnov * 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 +2007-01-14 Eyal Alaluf * 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 fa106e41f6d..3eff19d50dd 100644 --- 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 } } + internal string PortletNamespace + { + get { + if (_emptyPortletNamespace) + return null; + + if (_PortletNamespace == null) { + IPortletResponse portletResponse = GetRenderResponse (); + if (portletResponse != null) + _PortletNamespace = portletResponse.getNamespace (); + _emptyPortletNamespace = _PortletNamespace == null; + } + return _PortletNamespace; + } + } + // For J2EE Portal we need to use the portlet namespace when we generate control IDs. string GetDefaultName () { @@ -55,17 +71,10 @@ namespace System.Web.UI defaultName = defaultNameArray [defaultNumberID++]; } - if (this != _page || _emptyPortletNamespace) + if (this != _page) return defaultName; - if (_PortletNamespace == null) { - IPortletResponse portletResponse = GetRenderResponse (); - if (portletResponse != null) - _PortletNamespace = portletResponse.getNamespace (); - _emptyPortletNamespace = _PortletNamespace == null; - } - - return _PortletNamespace + defaultName; + return PortletNamespace + defaultName; } // Add a variant for specifying use of portlet resolveRenderUrl -- 2.25.1