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

Polish

Browse Source
This commit is contained in:
Phillip Webb
2012-11-13 21:23:29 -08:00
parent ccc6ea9742
commit 47e6c00485
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-faces/src/main/java/org/springframework/faces/webflow/FlowResponseStateManager.java
View File

@@ -32,10 +32,10 @@ import org.springframework.webflow.execution.RequestContextHolder;
/**
* A custom ResponseStateManager that writes JSF state to a Web Flow managed view-scoped variable. This class is plugged
* in via {@link FlowRenderKit}.
*
*
* @author Rossen Stoyanchev
* @author Phillip Webb
*
*
* @since 2.2.0
*/
public class FlowResponseStateManager extends ResponseStateManagerWrapper {
@@ -56,6 +56,7 @@ public class FlowResponseStateManager extends ResponseStateManagerWrapper {
this.wrapped = wrapped;
}
@Override
public ResponseStateManager getWrapped() {
return this.wrapped;
}
@@ -112,7 +113,7 @@ public class FlowResponseStateManager extends ResponseStateManagerWrapper {
/**
* See comments on {@link ResponseStateManager#VIEW_STATE_PARAM}.
*
*
* @param context the <code>FacesContext</code> for the current request
* @param writer the <code>ResponseWriter</code> to write to
* @throws IOException if an error occurs writing to the client
@@ -126,7 +127,7 @@ public class FlowResponseStateManager extends ResponseStateManagerWrapper {
/**
* See comments on <code>ResponseStateManager.RENDER_KIT_ID_PARAM</code> in
* {@link ResponseStateManager#writeState(FacesContext, Object)}.
*
*
* @param context the <code>FacesContext</code> for the current request
* @param writer the <code>ResponseWriter</code> to write to
* @throws IOException if an error occurs writing to the client

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

@@ -70,7 +70,7 @@ public class JsfViewFactory implements ViewFactory {
* be rendered in the case of an executing transition.
*/
public View getView(RequestContext context) {
FacesContext facesContext = FlowFacesContext.getCurrentInstance();
FacesContext facesContext = FacesContext.getCurrentInstance();
Assert.state(
facesContext != null,
"FacesContext has not been initialized within the current Web Flow request."
@@ -117,7 +117,7 @@ public class JsfViewFactory implements ViewFactory {
private boolean viewAlreadySet(FacesContext facesContext, String viewName) {
// the corner case where a before RESTORE_VIEW PhaseListener has handled setting the UIViewRoot
return (facesContext.getViewRoot() != null && facesContext.getViewRoot().getViewId().equals(viewName));
return facesContext.getViewRoot() != null && facesContext.getViewRoot().getViewId().equals(viewName);
}
private UIViewRoot getViewRootForAlreadySetView(RequestContext context, FacesContext facesContext) {