From 94b2d1da634634b074dd4aaf70c3e965ea087fe9 Mon Sep 17 00:00:00 2001 From: Jeremy Grelle Date: Thu, 16 Aug 2007 21:20:10 +0000 Subject: [PATCH] IN PROGRESS - issue SWF-388: Extract all JSF-related code into a separate component project http://opensource.atlassian.com/projects/spring/browse/SWF-388 --- .../faces/el/DelegatingFlowVariableResolver.java | 4 ++-- .../faces/el/FlowExecutionPropertyResolver.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-faces/src/main/java/org/springframework/faces/el/DelegatingFlowVariableResolver.java b/spring-faces/src/main/java/org/springframework/faces/el/DelegatingFlowVariableResolver.java index 5cbd5993..ab3623e2 100644 --- a/spring-faces/src/main/java/org/springframework/faces/el/DelegatingFlowVariableResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/el/DelegatingFlowVariableResolver.java @@ -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)) { diff --git a/spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionPropertyResolver.java b/spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionPropertyResolver.java index b9d6f2a9..824f5c48 100644 --- a/spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionPropertyResolver.java +++ b/spring-faces/src/main/java/org/springframework/faces/el/FlowExecutionPropertyResolver.java @@ -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)) {