You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by so...@apache.org on 2007/11/21 17:48:12 UTC
svn commit: r597140 - in /myfaces/portlet-bridge/trunk:
api/src/main/java/javax/portlet/faces/
impl/src/main/java/org/apache/myfaces/portlet/faces/application/
impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/
impl/src/main/java/org/apache/my...
Author: sobryan
Date: Wed Nov 21 08:48:11 2007
New Revision: 597140
URL: http://svn.apache.org/viewvc?rev=597140&view=rev
Log:
Fixed a few stragglers to the JDK 1.5 checkin.
Modified:
myfaces/portlet-bridge/trunk/api/src/main/java/javax/portlet/faces/BridgeUtil.java
myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java
myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/ActionResponseDecorator.java
Modified: myfaces/portlet-bridge/trunk/api/src/main/java/javax/portlet/faces/BridgeUtil.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/trunk/api/src/main/java/javax/portlet/faces/BridgeUtil.java?rev=597140&r1=597139&r2=597140&view=diff
==============================================================================
--- myfaces/portlet-bridge/trunk/api/src/main/java/javax/portlet/faces/BridgeUtil.java (original)
+++ myfaces/portlet-bridge/trunk/api/src/main/java/javax/portlet/faces/BridgeUtil.java Wed Nov 21 08:48:11 2007
@@ -21,7 +21,7 @@
{
public static boolean isPortletRequest()
{
- Map m = FacesContext.getCurrentInstance().getExternalContext().getRequestMap();
+ Map<String, Object> m = FacesContext.getCurrentInstance().getExternalContext().getRequestMap();
Bridge.PortletPhase phase = (Bridge.PortletPhase) m.get(Bridge.PORTLET_LIFECYCLE_PHASE);
if (phase != null)
{
@@ -35,7 +35,7 @@
public static boolean isPortletActionRequest()
{
- Map m = FacesContext.getCurrentInstance().getExternalContext().getRequestMap();
+ Map<String, Object> m = FacesContext.getCurrentInstance().getExternalContext().getRequestMap();
Bridge.PortletPhase phase = (Bridge.PortletPhase) m.get(Bridge.PORTLET_LIFECYCLE_PHASE);
if (phase != null && phase == Bridge.PortletPhase.ActionPhase)
{
Modified: myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java?rev=597140&r1=597139&r2=597140&view=diff
==============================================================================
--- myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java (original)
+++ myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java Wed Nov 21 08:48:11 2007
@@ -93,7 +93,7 @@
if (stateValue != null)
{
- Map m = context.getExternalContext().getRequestMap();
+ Map<String, Object> m = context.getExternalContext().getRequestMap();
m.put(BridgeImpl.UPDATED_VIEW_STATE_PARAM, stateValue);
}
Modified: myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java?rev=597140&r1=597139&r2=597140&view=diff
==============================================================================
--- myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java (original)
+++ myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java Wed Nov 21 08:48:11 2007
@@ -80,7 +80,9 @@
public class BridgeImpl
implements Bridge, ELContextListener, PhaseListener
{
- // public so PortletStateManager can see/use
+ private static final long serialVersionUID = 5807626987246270989L;
+
+ // public so PortletStateManager can see/use
public static final String UPDATED_VIEW_STATE_PARAM = "org.apache.myfaces.portlet.faces.updatedViewStateParam";
private static final String REQUEST_SCOPE_LOCK = "org.apache.myfaces.portlet.faces.requestScopeLock";
@@ -742,7 +744,6 @@
}
return copy;
}
-
@SuppressWarnings("unchecked")
private List<String> getExcludedAttributes(PortletRequest request)
Modified: myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/ActionResponseDecorator.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/ActionResponseDecorator.java?rev=597140&r1=597139&r2=597140&view=diff
==============================================================================
--- myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/ActionResponseDecorator.java (original)
+++ myfaces/portlet-bridge/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/ActionResponseDecorator.java Wed Nov 21 08:48:11 2007
@@ -167,7 +167,8 @@
* if the method is invoked after <code>sendRedirect</code> has been called.
*/
// FIXME: When portlet API is Java 5 compliant, fix this generic issue
- public void setRenderParameters(Map parameters)
+ @SuppressWarnings("unchecked")
+ public void setRenderParameters(Map parameters)
{
// mResponse is a protected memeber of PortletResponseDecorator
((ActionResponse) mResponse).setRenderParameters(parameters);