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

IN PROGRESS - issue SWF-388: Extract all JSF-related code into a separate component project

Browse Source 
http://opensource.atlassian.com/projects/spring/browse/SWF-388
This commit is contained in:
Jeremy Grelle
2007-08-16 21:20:10 +00:00
parent 7b3a33eb90
commit 94b2d1da63
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-faces/src/main/java/org/springframework/faces/el/DelegatingFlowVariableResolver.java
View File

@@ -68,8 +68,8 @@ public class DelegatingFlowVariableResolver extends VariableResolver {
if (execution != null) {
if (execution.isActive()) {
// flow execution is active: try flash/flow/conversation scope
if (execution.getActiveSession().getFlashMap().contains(name)) {
return execution.getActiveSession().getFlashMap().get(name);
if (execution.getFlashScope().contains(name)) {
return execution.getFlashScope().get(name);
} else if (execution.getActiveSession().getScope().contains(name)) {
return execution.getActiveSession().getScope().get(name);
} else if (execution.getConversationScope().contains(name)) {

10
spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionPropertyResolver.java
View File

@@ -65,7 +65,7 @@ public class FlowExecutionPropertyResolver extends AbstractFlowExecutionProperty
// perform an attribute search
// try flash scope first
Object value = execution.getActiveSession().getFlashMap().get(attributeName);
Object value = execution.getFlashScope().get(attributeName);
if (value != null) {
return value.getClass();
}
@@ -86,7 +86,7 @@ public class FlowExecutionPropertyResolver extends AbstractFlowExecutionProperty
protected Object doGetAttribute(FlowExecution execution, String attributeName) {
if (FLASH_SCOPE_PROPERTY.equals(attributeName)) {
return execution.getActiveSession().getFlashMap().asMap();
return execution.getFlashScope().asMap();
} else if (FLOW_SCOPE_PROPERTY.equals(attributeName)) {
return execution.getActiveSession().getScope().asMap();
} else if (CONVERSATION_SCOPE_PROPERTY.equals(attributeName)) {
@@ -95,7 +95,7 @@ public class FlowExecutionPropertyResolver extends AbstractFlowExecutionProperty
// perform an attribute search
// try flash scope
Object value = execution.getActiveSession().getFlashMap().get(attributeName);
Object value = execution.getFlashScope().get(attributeName);
if (value != null) {
return value;
}
@@ -117,8 +117,8 @@ public class FlowExecutionPropertyResolver extends AbstractFlowExecutionProperty
protected void doSetAttribute(FlowExecution execution, String attributeName, Object attributeValue) {
// perform a search
if (execution.getActiveSession().getFlashMap().contains(attributeName)) {
execution.getActiveSession().getFlashMap().put(attributeName, attributeValue);
if (execution.getFlashScope().contains(attributeName)) {
execution.getFlashScope().put(attributeName, attributeValue);
} else if (execution.getActiveSession().getScope().contains(attributeName)) {
execution.getActiveSession().getScope().put(attributeName, attributeValue);
} else if (execution.getConversationScope().contains(attributeName)) {