From bc2ca0351c91b99257ad1e1796584233fa4cc15c Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Fri, 1 Oct 2010 09:56:54 +0000 Subject: [PATCH] SWF-1402 Add missing delegation methods to FlowViewResponseStateManager and add check for Web Flow request i FlowRenderKit --- .../faces/webflow/FlowRenderKit.java | 4 ++-- .../faces/webflow/FlowViewResponseStateManager.java | 13 +++++++++++-- .../src/main/webapp/WEB-INF/layouts/standard.xhtml | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowRenderKit.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowRenderKit.java index 98f53dcd..f2d2070e 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowRenderKit.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowRenderKit.java @@ -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(); } } diff --git a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewResponseStateManager.java b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewResponseStateManager.java index 1109a153..69e6c8c6 100644 --- a/spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewResponseStateManager.java +++ b/spring-faces/src/main/java/org/springframework/faces/webflow/FlowViewResponseStateManager.java @@ -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() { diff --git a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml index 2cb6af78..d17cbcff 100644 --- a/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml +++ b/spring-webflow-samples/booking-faces/src/main/webapp/WEB-INF/layouts/standard.xhtml @@ -14,7 +14,7 @@