Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWF-1402 Add missing delegation methods to FlowViewResponseStateManager and add check for Web Flow request i FlowRenderKit

Browse Source
This commit is contained in:
Rossen Stoyanchev
2010-10-01 09:56:54 +00:00
parent d18971b61e
commit bc2ca0351c
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-faces/src/main/java/org/springframework/faces/webflow/FlowRenderKit.java
View File

@@ -52,8 +52,8 @@ public class FlowRenderKit extends RenderKitWrapper {
* ResponseStateManager instance otherwise.
*/
public ResponseStateManager getResponseStateManager() {
return (JsfRuntimeInformation.isPartialStateSavingSupported()) ? responseStateManager : delegate
.getResponseStateManager();
return (JsfUtils.isFlowRequest() && JsfRuntimeInformation.isPartialStateSavingSupported()) ? responseStateManager
: delegate.getResponseStateManager();
}
}

13
spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewResponseStateManager.java
View File

@@ -18,6 +18,7 @@ package org.springframework.faces.webflow;
import java.io.IOException;
import java.io.Writer;
import javax.faces.application.StateManager.SerializedView;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.render.RenderKitFactory;
@@ -129,18 +130,26 @@ public class FlowViewResponseStateManager extends ResponseStateManager {
// ------------------- Delegation methods ------------------//
@SuppressWarnings( { "deprecation" })
@Override
public boolean isPostback(FacesContext context) {
return delegate.isPostback(context);
}
@Override
public Object getTreeStructureToRestore(FacesContext context, String viewId) {
return delegate.getTreeStructureToRestore(context, viewId);
}
@SuppressWarnings( { "deprecation" })
@Override
public Object getComponentStateToRestore(FacesContext context) {
return delegate.getComponentStateToRestore(context);
}
@Override
public void writeState(FacesContext context, SerializedView state) throws IOException {
delegate.writeState(context, state);
}
// ------------------- Private helper methods ------------------//
private String getFlowExecutionKey() {

2
spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml
View File

@@ -14,7 +14,7 @@
<link rel="stylesheet" href="${request.contextPath}/styles/blueprint/screen.css" type="text/css" media="screen, projection" />
<link rel="stylesheet" href="${request.contextPath}/styles/blueprint/print.css" type="text/css" media="print" />
<!--[if lt IE 8]>
<link rel="stylesheet" href="<c:url value="/blueprint/ie.css" />" type="text/css" media="screen, projection" />
<link rel="stylesheet" href="${request.contextPath}/styles/blueprint/ie.css" type="text/css" media="screen, projection" />
<![endif]-->
<link rel="stylesheet" href="${request.contextPath}/styles/le-frog/jquery-ui-1.8.2.custom.css" type="text/css" media="screen" />
<ui:insert name="headIncludes"/>