You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2008/04/09 18:40:37 UTC
svn commit: r646433 - in /myfaces/portlet-bridge/core/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/apac...
Author: mfreedman
Date: Wed Apr 9 09:40:35 2008
New Revision: 646433
URL: http://svn.apache.org/viewvc?rev=646433&view=rev
Log:
PortletBridge-32: Fixes problems with parsing VIEW_STATE in a multi-form view. Also a few other minor changes related to cleaning up exception handling.
Modified:
myfaces/portlet-bridge/core/trunk/api/src/main/java/javax/portlet/faces/Bridge.java
myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java
myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java
Modified: myfaces/portlet-bridge/core/trunk/api/src/main/java/javax/portlet/faces/Bridge.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/api/src/main/java/javax/portlet/faces/Bridge.java?rev=646433&r1=646432&r2=646433&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/api/src/main/java/javax/portlet/faces/Bridge.java (original)
+++ myfaces/portlet-bridge/core/trunk/api/src/main/java/javax/portlet/faces/Bridge.java Wed Apr 9 09:40:35 2008
@@ -290,8 +290,9 @@
* all other internal exceptions are converted to a BridgeException.
*/
public void doFacesRequest(ActionRequest request, ActionResponse response)
- throws BridgeDefaultViewNotSpecifiedException,
- BridgeException;
+ throws BridgeDefaultViewNotSpecifiedException,
+ BridgeUninitializedException,
+ BridgeException;
/**
* Called by the portlet when it wants the bridge to process a render request.
@@ -309,8 +310,9 @@
* all other internal exceptions are converted to a BridgeException.
*/
public void doFacesRequest(RenderRequest request, RenderResponse response)
- throws BridgeDefaultViewNotSpecifiedException,
- BridgeException;
+ throws BridgeDefaultViewNotSpecifiedException,
+ BridgeUninitializedException,
+ BridgeException;
/**
* Called by the portlet to take the bridge out of service. Once out of service, the bridge must
Modified: myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java?rev=646433&r1=646432&r2=646433&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java (original)
+++ myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java Wed Apr 9 09:40:35 2008
@@ -396,9 +396,9 @@
int tildeIdx = mBuilder.indexOf(SAVESTATE_FIELD_MARKER);
while (tildeIdx > 0)
{
- writer.write(mBuilder.substring(pos, (tildeIdx - pos)));
+ writer.write(mBuilder.substring(pos, tildeIdx));
stateManager.writeState(mContext, stateToWrite);
- pos += tildeIdx + markLen;
+ pos = tildeIdx + markLen;
tildeIdx = mBuilder.indexOf(SAVESTATE_FIELD_MARKER, pos);
}
writer.write(mBuilder.substring(pos));
Modified: myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java?rev=646433&r1=646432&r2=646433&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java (original)
+++ myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java Wed Apr 9 09:40:35 2008
@@ -70,6 +70,7 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.portlet.faces.Bridge;
+import javax.portlet.faces.BridgeDefaultViewNotSpecifiedException;
import javax.portlet.faces.BridgeException;
import javax.portlet.faces.BridgeUninitializedException;
import javax.portlet.faces.annotation.BridgePreDestroy;
@@ -198,7 +199,10 @@
}
public void doFacesRequest(ActionRequest request, ActionResponse response)
- throws BridgeException, BridgeUninitializedException, NullPointerException
+ throws BridgeException,
+ BridgeDefaultViewNotSpecifiedException,
+ BridgeUninitializedException,
+ NullPointerException
{
if (!mInitialized)
throw new BridgeUninitializedException();
@@ -354,7 +358,10 @@
}
public void doFacesRequest(RenderRequest request, RenderResponse response)
- throws BridgeException, BridgeUninitializedException, NullPointerException
+ throws BridgeException,
+ BridgeDefaultViewNotSpecifiedException,
+ BridgeUninitializedException,
+ NullPointerException
{
if (!mInitialized)
throw new BridgeUninitializedException();
@@ -387,7 +394,7 @@
Lifecycle lifecycle = getLifecycle();
context =
getFacesContextFactory().getFacesContext(mPortletConfig, request, response, lifecycle);
- ExternalContext extCtx = context.getExternalContext();
+ ExternalContext extCtx = context.getExternalContext();
// Use request from ExternalContext in case its been wrapped by an
// extension
Modified: myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java?rev=646433&r1=646432&r2=646433&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java (original)
+++ myfaces/portlet-bridge/core/trunk/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java Wed Apr 9 09:40:35 2008
@@ -1273,8 +1273,8 @@
}
else
{
- // Set to what follows the URL
- viewId = url;
+ // Not a Faces URL
+ viewId = null;
}
return viewId;
}