[portal-commits] JBoss Portal SVN: r6061 - in trunk: theme/src/main/org/jboss/portal/theme and 1 other directory.

Author: julien(a)jboss.com Date: 2007-01-21 19:51:36 -0500 (Sun, 21 Jan 2007) New Revision: 6061 Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java Log: move the choice of the maximized region for the page result from the render page command to the page rendition object Modified: trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java =================================================================== --- trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-01-21 02:11:45 UTC (rev 6060) +++ trunk/core/src/main/org/jboss/portal/core/model/portal/command/RenderPageCommand.java 2007-01-22 00:51:36 UTC (rev 6061) @@ -22,7 +22,6 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command; -import org.jboss.portal.WindowState; import org.jboss.portal.common.invocation.InvocationException; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerException; @@ -63,7 +62,6 @@ import java.util.List; import java.util.StringTokenizer; import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; /** * Render a full page. @@ -270,40 +268,6 @@ } } - // Take care of maximized window HERE - for (Iterator i = pageResult.getWindowIds().iterator();i.hasNext();) - { - PortalObjectId windowId = (PortalObjectId)i.next(); - WindowResult res = pageResult.getWindowResult(windowId); - if (WindowState.MAXIMIZED.equals(res.getWindowState())) - { - PageResult newRes = new PageResult( - pageResult.getPageName(), - pageResult.getPageProperties(), - pageResult.getPortalProperties()); - - // - WindowContext ctx = pageResult.getWindowContext(windowId); - - // - newRes.setLayoutState("maximized"); - newRes.setLayoutURI(layout.getLayoutInfo().getURI("maximized")); - - // - ctx.setRegionName("maximized"); - ctx.setOrder(0); - - // - newRes.addWindowContext(ctx); - newRes.addWindowResult(windowId, res); - - // - pageResult = newRes; - - break; - } - } - // Make the theme available as servlet request attribute (needed for CM) if (theme != null) { Modified: trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java =================================================================== --- trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java 2007-01-21 02:11:45 UTC (rev 6060) +++ trunk/theme/src/main/org/jboss/portal/theme/PageRendition.java 2007-01-22 00:51:36 UTC (rev 6061) @@ -25,10 +25,14 @@ import org.jboss.portal.server.ServerInvocation; import org.jboss.portal.theme.page.PageService; import org.jboss.portal.theme.page.PageResult; +import org.jboss.portal.theme.page.WindowResult; +import org.jboss.portal.theme.page.WindowContext; +import org.jboss.portal.WindowState; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import java.io.IOException; +import java.util.Iterator; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -59,6 +63,42 @@ // HttpServletRequest clientRequest = invocation.getServerContext().getClientRequest(); + // Take care of maximized window + // if one window is maximized then we do chose the maximized layout for the rendition + // and put that window on the maximized region of this layout + for (Iterator i = pageResult.getWindowIds().iterator();i.hasNext();) + { + Object windowId = i.next(); + WindowResult res = pageResult.getWindowResult(windowId); + if (WindowState.MAXIMIZED.equals(res.getWindowState())) + { + PageResult newRes = new PageResult( + pageResult.getPageName(), + pageResult.getPageProperties(), + pageResult.getPortalProperties()); + + // + WindowContext ctx = pageResult.getWindowContext(windowId); + + // + newRes.setLayoutState("maximized"); + newRes.setLayoutURI(layout.getLayoutInfo().getURI("maximized")); + + // + ctx.setRegionName("maximized"); + ctx.setOrder(0); + + // + newRes.addWindowContext(ctx); + newRes.addWindowResult(windowId, res); + + // + pageResult = newRes; + + break; + } + } + try {