Author: chris.laprun(a)jboss.com Date: 2008-04-10 20:35:04 -0400 (Thu, 10 Apr 2008) New Revision: 10531 Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutCommandFactoryService.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java Log: - Minor improvements. Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java 2008-04-11 00:31:22 UTC (rev 10530) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/command/mapper/AbstractCommandFactory.java 2008-04-11 00:35:04 UTC (rev 10531) @@ -22,10 +22,7 @@ ******************************************************************************/ package org.jboss.portal.core.controller.command.mapper; -import org.jboss.portal.core.controller.ControllerCommand; -import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.jems.as.system.AbstractJBossService; -import org.jboss.portal.server.ServerInvocation; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -33,9 +30,4 @@ */ public abstract class AbstractCommandFactory extends AbstractJBossService implements CommandFactory { - - public abstract ControllerCommand doMapping( - ControllerContext controllerContext, ServerInvocation invocation, - String host, String contextPath, - String requestPath); } Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutCommandFactoryService.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutCommandFactoryService.java 2008-04-11 00:31:22 UTC (rev 10530) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/controller/command/mapper/SignOutCommandFactoryService.java 2008-04-11 00:35:04 UTC (rev 10531) @@ -49,7 +49,7 @@ { if (parameterMap.get("location") != null) { - location = URLDecoder.decode(((String[])parameterMap.get("location"))[0], "UTF-8"); + location = URLDecoder.decode(parameterMap.get("location")[0], "UTF-8"); } } catch (UnsupportedEncodingException e) Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java 2008-04-11 00:31:22 UTC (rev 10530) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderPageCommand.java 2008-04-11 00:35:04 UTC (rev 10531) @@ -56,7 +56,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; /** * Render a full page. @@ -71,7 +70,7 @@ private static final CommandInfo info = new ViewCommandInfo(); /** The windows to render. */ - private Collection windows; + private Collection<PortalObject> windows; /** . */ private boolean personalizable; @@ -106,7 +105,7 @@ super.acquireResources(); // All windows on the page - windows = new ArrayList(getPage().getChildren(PortalObject.WINDOW_MASK)); + windows = new ArrayList<PortalObject>(getPage().getChildren(PortalObject.WINDOW_MASK)); } protected Page initPage() @@ -186,12 +185,11 @@ WindowContextFactory wcFactory = new WindowContextFactory(context); // Render the windows - for (Iterator i = windows.iterator(); i.hasNext();) + for (PortalObject po : windows) { - PortalObject o = (PortalObject)i.next(); - if (o instanceof Window) + if (po instanceof Window) { - Window window = (Window)o; + Window window = (Window)po; RenderWindowCommand renderCmd = new RenderWindowCommand(window.getId()); // Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java 2008-04-11 00:31:22 UTC (rev 10530) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java 2008-04-11 00:35:04 UTC (rev 10531) @@ -22,23 +22,23 @@ ******************************************************************************/ package org.jboss.portal.core.model.portal.command.render; +import org.jboss.portal.common.invocation.AttributeResolver; import org.jboss.portal.core.controller.ControllerContext; import org.jboss.portal.core.controller.ControllerException; import org.jboss.portal.core.controller.ControllerResponse; -import org.jboss.portal.core.controller.portlet.PortletInvocationFactory; import org.jboss.portal.core.controller.command.info.CommandInfo; import org.jboss.portal.core.controller.command.info.ViewCommandInfo; +import org.jboss.portal.core.controller.portlet.PortletInvocationFactory; import org.jboss.portal.core.model.content.ContentType; import org.jboss.portal.core.model.portal.PortalObjectId; -import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; import org.jboss.portal.core.model.portal.command.WindowCommand; import org.jboss.portal.core.model.portal.content.ContentRenderer; +import org.jboss.portal.core.model.portal.content.ContentRendererContext; import org.jboss.portal.core.model.portal.content.ContentRendererRegistry; import org.jboss.portal.core.model.portal.content.WindowRendition; -import org.jboss.portal.core.model.portal.content.ContentRendererContext; import org.jboss.portal.core.model.portal.control.page.PageControlContext; +import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState; import org.jboss.portal.core.navstate.NavigationalStateKey; -import org.jboss.portal.common.invocation.AttributeResolver; import org.jboss.portal.identity.User; import org.jboss.portal.portlet.invocation.RenderInvocation; @@ -55,8 +55,7 @@ /** . */ private WindowRendition rendition; - public RenderWindowCommand(PortalObjectId windowId) - throws IllegalArgumentException + public RenderWindowCommand(PortalObjectId windowId) throws IllegalArgumentException { super(windowId); }