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

Remove dependency on CompositeComponentStackManager

Browse Source 
Issue: SWF-1667
This commit is contained in:
Rossen Stoyanchev
2015-08-06 15:58:12 -04:00
parent f860d9e17a
commit 764e965dcc
1 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2004-2014 the original author or authors. * Copyright 2004-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -15,11 +15,8 @@
*/ */
package org.springframework.faces.webflow; package org.springframework.faces.webflow;
import static org.springframework.faces.webflow.JsfRuntimeInformation.isPortletRequest;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Iterator; import java.util.Iterator;
import javax.el.ValueExpression; import javax.el.ValueExpression;
import javax.faces.application.ViewHandler; import javax.faces.application.ViewHandler;
import javax.faces.component.EditableValueHolder; import javax.faces.component.EditableValueHolder;
@@ -37,11 +34,14 @@ import javax.faces.lifecycle.Lifecycle;
import com.sun.faces.component.CompositeComponentStackManager; import com.sun.faces.component.CompositeComponentStackManager;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.binding.expression.Expression; import org.springframework.binding.expression.Expression;
import org.springframework.webflow.execution.RequestContext; import org.springframework.webflow.execution.RequestContext;
import org.springframework.webflow.execution.View; import org.springframework.webflow.execution.View;
import org.springframework.webflow.execution.ViewFactory; import org.springframework.webflow.execution.ViewFactory;
import static org.springframework.faces.webflow.JsfRuntimeInformation.isPortletRequest;
/** /**
* JSF-specific {@link ViewFactory} implementation. * JSF-specific {@link ViewFactory} implementation.
* *
@@ -161,11 +161,9 @@ public class JsfViewFactory implements ViewFactory {
*/ */
private void processTree(FacesContext context, UIComponent component) { private void processTree(FacesContext context, UIComponent component) {
// For correct evaluation of #{cc.XXX} binding expressions Object mojarraTreeHandler = null;
CompositeComponentStackManager stackManager = CompositeComponentStackManager.getManager(context); if (!JsfRuntimeInformation.isMyFacesInUse()) {
boolean pushed = false; mojarraTreeHandler = new MojarraProcessTreeHandler().handleBefore(context, component);
if (UIComponent.isCompositeComponent(component)) {
pushed = stackManager.push(component, CompositeComponentStackManager.StackType.TreeCreation);
} }
// Only resetting the valid flag in the RESTORE_VIEW phase, // Only resetting the valid flag in the RESTORE_VIEW phase,
@@ -184,8 +182,8 @@ public class JsfViewFactory implements ViewFactory {
processTree(context, it.next()); processTree(context, it.next());
} }
if (pushed) { if (mojarraTreeHandler != null) {
stackManager.pop(CompositeComponentStackManager.StackType.TreeCreation); ((MojarraProcessTreeHandler) mojarraTreeHandler).handleAfter();
} }
} }
@@ -215,4 +213,26 @@ public class JsfViewFactory implements ViewFactory {
} }
} }
private static class MojarraProcessTreeHandler {
private CompositeComponentStackManager stackManager;
private boolean pushed;
public MojarraProcessTreeHandler handleBefore(FacesContext context, UIComponent component) {
// For correct evaluation of #{cc.XXX} binding expressions
this.stackManager = CompositeComponentStackManager.getManager(context);
if (UIComponent.isCompositeComponent(component)) {
this.pushed = stackManager.push(component, CompositeComponentStackManager.StackType.TreeCreation);
}
return this;
}
public void handleAfter() {
if (this.pushed) {
this.stackManager.pop(CompositeComponentStackManager.StackType.TreeCreation);
}
}
}
} }