[jboss-svn-commits] JBoss Portal SVN: r5165 - in trunk/theme/src/main/org/jboss/portal/theme: . render

[jboss-svn-commits at lists.jboss.org]

Author: roy.russo at jboss.com
Date: 2006-09-07 17:07:16 -0400 (Thu, 07 Sep 2006)
New Revision: 5165

Modified:
   trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java
   trunk/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java
Log:
- added theme and themeResult to request. This is needed as the ThemeTagHandler requires it.

Modified: trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java	2006-09-06 22:51:40 UTC (rev 5164)
+++ trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java	2006-09-07 21:07:16 UTC (rev 5165)
@@ -81,7 +81,8 @@
          // Place a reference to the theme service into the request so that the theme tag can get to a theme via a theme
          // name (specified as tag attribute); this is useful if no theme was defined for the portal or the page
          clientRequest.setAttribute(ThemeConstants.ATTR_THEMESERVER, pageService.getThemeService());
-
+         clientRequest.setAttribute(ThemeConstants.ATTR_THEME, markupResult.getTheme());
+         clientRequest.setAttribute(ThemeConstants.ATTR_THEMERESULT, markupResult.getThemeResult());
          // now delegate to the layout to do the rest (assemble the markup fragments into a response)
          layout.assembleResponse(invocation, markupResult);
       }

Modified: trunk/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java	2006-09-06 22:51:40 UTC (rev 5164)
+++ trunk/theme/src/main/org/jboss/portal/theme/render/MarkupResult.java	2006-09-07 21:07:16 UTC (rev 5165)
@@ -27,6 +27,8 @@
 import org.jboss.portal.theme.navigation.WindowNavigationalState;
 import org.jboss.portal.theme.page.WindowContext;
 import org.jboss.portal.theme.page.WindowResult;
+import org.jboss.portal.theme.ThemeResult;
+import org.jboss.portal.theme.PortalTheme;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -50,7 +52,30 @@
    protected String layoutURI;
    protected String layoutState;
    protected PortalRenderSet renderSet;
+   protected ThemeResult themeResult;
+   protected PortalTheme theme;
 
+   public ThemeResult getThemeResult()
+   {
+      return themeResult;
+   }
+
+   public void setThemeResult(ThemeResult themeResult)
+   {
+      this.themeResult = themeResult;
+   }
+
+   public PortalTheme getTheme()
+   {
+      return theme;
+   }
+
+   public void setTheme(PortalTheme theme)
+   {
+      this.theme = theme;
+   }
+
+
    public MarkupResult()
    {
       this(null, null, null, null);