Author: julien(a)jboss.com Date: 2008-01-15 09:38:23 -0500 (Tue, 15 Jan 2008) New Revision: 9511 Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalNavigationalState.java modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java Log: minor foreach Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalNavigationalState.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalNavigationalState.java 2008-01-15 14:26:15 UTC (rev 9510) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortalNavigationalState.java 2008-01-15 14:38:23 UTC (rev 9511) @@ -22,6 +22,9 @@ ******************************************************************************/ package org.jboss.portal.portlet.test; +import org.jboss.portal.common.util.ParameterMap; +import org.jboss.portal.portlet.PortletParameters; + import java.util.Map; import java.util.HashMap; import java.util.zip.GZIPOutputStream; @@ -43,6 +46,9 @@ /** . */ private final Map<String, WindowNavigationalState> windows = new HashMap<String, WindowNavigationalState>(); + /** . */ + private final PortletParameters sharedParameters = new PortletParameters(); + public WindowNavigationalState getWindow(String windowId) { return windows.get(windowId); @@ -53,6 +59,11 @@ windows.put(windowId, window); } + public ParameterMap getSharedParameters() + { + return sharedParameters; + } + public byte[] getBytes() throws IOException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java =================================================================== --- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-15 14:26:15 UTC (rev 9510) +++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/PortletController.java 2008-01-15 14:38:23 UTC (rev 9511) @@ -55,7 +55,6 @@ import java.io.UnsupportedEncodingException; import java.io.PrintWriter; import java.io.IOException; -import java.util.Iterator; import java.util.List; import java.util.ArrayList; import java.util.LinkedList; @@ -363,9 +362,8 @@ // try { - for (Iterator i = context.getPortlets().iterator(); i.hasNext();) + for (Portlet portlet : context.getPortlets()) { - Portlet portlet = (Portlet)i.next(); writer.print("<div><div>" + portlet.getContext() + "</div>"); PortletURLRenderer renderer = new PortletURLRenderer(navState, portlet, req, resp); @@ -380,15 +378,15 @@ { if (windowNS.getMode() != null) { - mode= windowNS.getMode(); + mode = windowNS.getMode(); } if (windowNS.getWindowState() != null) { - windowState= windowNS.getWindowState(); + windowState = windowNS.getWindowState(); } if (windowNS.getPortletNavigationalState() != null) { - portletNS= windowNS.getPortletNavigationalState(); + portletNS = windowNS.getPortletNavigationalState(); } }