Author: julien(a)jboss.com
Date: 2007-04-25 15:42:25 -0400 (Wed, 25 Apr 2007)
New Revision: 7054
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java
Log:
inline trivial method
Modified:
trunk/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java
===================================================================
---
trunk/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java 2007-04-25
19:40:14 UTC (rev 7053)
+++
trunk/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java 2007-04-25
19:42:25 UTC (rev 7054)
@@ -46,6 +46,7 @@
import org.jboss.portal.theme.PortalTheme;
import org.jboss.portal.theme.ThemeConstants;
import org.jboss.portal.theme.PageService;
+import org.jboss.portal.theme.ThemeService;
import org.jboss.portal.theme.page.PageResult;
import org.jboss.portal.theme.page.WindowResult;
import org.jboss.portal.theme.page.WindowContext;
@@ -152,6 +153,7 @@
{
//
PageService pageService = context.getController().getPageService();
+ ThemeService themeService = pageService.getThemeService();
// The theme for the page
PortalTheme theme = null;
@@ -180,7 +182,7 @@
if (themeId != null)
{
- theme = getTheme(themeId);
+ theme = themeService.getThemeById(themeId);
}
}
}
@@ -189,7 +191,7 @@
if (theme == null)
{
String themeId = page.getProperty(ThemeConstants.PORTAL_PROP_THEME);
- theme = getTheme(themeId);
+ theme = themeService.getThemeById(themeId);
}
// Call the portlet container to create the markup fragment(s) for each portlet
that needs to render itself
@@ -257,11 +259,6 @@
return null;
}
- private PortalTheme getTheme(String themeIdString)
- {
- return
context.getController().getPageService().getThemeService().getThemeById(themeIdString);
- }
-
/**
* Get the portal layout to use for the provided page. <p>The name of the layout
to use can be defined as a property
* in the portal, or the individual page. The page property overwrites the portal
property. If no property was set, a
Show replies by date