Author: chris.laprun(a)jboss.com Date: 2008-06-04 13:13:15 -0400 (Wed, 04 Jun 2008) New Revision: 10921 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java Log: - More generics. - Minor improvements. Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2008-06-04 13:42:23 UTC (rev 10920) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2008-06-04 17:13:15 UTC (rev 10921) @@ -413,7 +413,7 @@ this.selectedContentURI = uri; // TODO: Get params from the payload (for widgets) - this.selectedContentParameters = new HashMap(); + this.selectedContentParameters = eventEvent.getParameterMap(); } } else if (event instanceof PortletActionEvent) Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-06-04 13:42:23 UTC (rev 10920) +++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/JSFInvocation.java 2008-06-04 17:13:15 UTC (rev 10921) @@ -59,7 +59,6 @@ import javax.faces.context.FacesContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Iterator; import java.util.Map; /** @@ -139,14 +138,12 @@ // PortletRequestEncoder encoder = new PortletRequestEncoder(); encoder.encodeRender(actionPortletURL.getInteractionState(), portletURL.getMode(), portletURL.getWindowState()); - for (Iterator i = encoder.getQueryParameters().entrySet().iterator(); i.hasNext();) + for (Map.Entry entry : encoder.getQueryParameters().entrySet()) { - Map.Entry entry = (Map.Entry)i.next(); String name = FastURLEncoder.getUTF8Instance().encode((String)entry.getKey()); String[] values = (String[])entry.getValue(); - for (int j = 0; j < values.length; j++) + for (String value : values) { - String value = values[j]; url.append("&amp;").append(name).append('='); FastURLEncoder.getUTF8Instance().encode(value, url); } Modified: branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java 2008-06-04 13:42:23 UTC (rev 10920) +++ branches/JBoss_Portal_Branch_2_7/faces/src/main/org/jboss/portal/faces/component/portlet/UIPortlet.java 2008-06-04 17:13:15 UTC (rev 10921) @@ -27,11 +27,11 @@ import org.jboss.portal.common.NotYetImplemented; import org.jboss.portal.common.util.ParameterMap; import org.jboss.portal.faces.util.ActionEventDispatcher; +import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.Portlet; import org.jboss.portal.portlet.PortletContext; import org.jboss.portal.portlet.PortletInvoker; import org.jboss.portal.portlet.PortletInvokerException; -import org.jboss.portal.portlet.ParametersStateString; import org.jboss.portal.portlet.impl.PortletRequestDecoder; import org.jboss.portal.portlet.invocation.response.FragmentResponse; import org.jboss.portal.portlet.invocation.response.InsufficientPrivilegesResponse; @@ -39,6 +39,7 @@ import org.jboss.portal.portlet.invocation.response.UpdateNavigationalStateResponse; import javax.faces.component.UICommand; +import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.context.ResponseWriter; import javax.faces.el.MethodBinding; @@ -49,10 +50,8 @@ import javax.portlet.ActionRequest; import javax.portlet.EventRequest; import javax.portlet.RenderRequest; - import java.io.IOException; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -449,18 +448,17 @@ public void decode(FacesContext faces) { String clientId = getClientId(faces); - String clientIdValue = (String)faces.getExternalContext().getRequestParameterMap().get(clientId); - - Object obj = faces.getExternalContext().getRequest(); + ExternalContext externalContext = faces.getExternalContext(); + String clientIdValue = (String)externalContext.getRequestParameterMap().get(clientId); - // We have been targetted + // We have been targeted if ("jbp".equals(clientIdValue)) { - Map jsfParams = faces.getExternalContext().getRequestParameterValuesMap(); + Map jsfParams = externalContext.getRequestParameterValuesMap(); Map portletParams = new HashMap(); - for (Iterator i = jsfParams.entrySet().iterator(); i.hasNext();) + for (Object o : jsfParams.entrySet()) { - Map.Entry entry = (Map.Entry)i.next(); + Map.Entry entry = (Map.Entry)o; String name = (String)entry.getKey(); if (clientId.equals(name)) { @@ -468,7 +466,7 @@ } else { - String[] values = (String[])((String[])entry.getValue()).clone(); + String[] values = ((String[])entry.getValue()).clone(); portletParams.put(name, values); } } @@ -479,7 +477,8 @@ Mode mode = decoder.getMode(); WindowState windowState = decoder.getWindowState(); - if (obj instanceof RenderRequest) + Object request = externalContext.getRequest(); + if (request instanceof RenderRequest) { PortletRenderEvent prevent = new PortletRenderEvent( this, @@ -489,7 +488,7 @@ prevent.setPhaseId(PhaseId.INVOKE_APPLICATION); queueEvent(prevent); } - else if (obj instanceof ActionRequest) + else if (request instanceof ActionRequest) { if (mode == null) { @@ -501,13 +500,13 @@ } PortletActionEvent paevent = new PortletActionEvent( this, - ParameterMap.clone(((ActionRequest)obj).getParameterMap()), + ParameterMap.clone(((ActionRequest)request).getParameterMap()), mode, windowState); paevent.setPhaseId(PhaseId.INVOKE_APPLICATION); queueEvent(paevent); } - else if (obj instanceof EventRequest) + else if (request instanceof EventRequest) { throw new NotYetImplemented(); }