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

polish

Browse Source
This commit is contained in:
Keith Donald
2007-04-05 19:23:52 +00:00
parent ca3ac7a0b9
commit 1b6f340d2f
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowNavigationHandler.java
View File

@@ -152,8 +152,7 @@ public class FlowNavigationHandler extends DecoratingNavigationHandler {
NavigationHandler originalNavigationHandler) {
JsfExternalContext context = new JsfExternalContext(facesContext, fromAction, outcome);
if (FlowExecutionHolderUtils.isFlowExecutionRestored(facesContext)) {
// the flow execution has been restored, now see if we need to
// signal an event against it
// the flow execution has been restored, now see if we need to signal an event against it
if (argumentExtractor.isEventIdPresent(context)) {
// a flow execution has been restored, signal an event in it
String eventId = argumentExtractor.extractEventId(context);
@@ -163,8 +162,7 @@ public class FlowNavigationHandler extends DecoratingNavigationHandler {
}
}
else {
// no flow execution exists, see if we need to launch one if the
// flow id is present
// no flow execution exists, see if we need to launch one if the flow id is present
if (argumentExtractor.isFlowIdPresent(context)) {
// a flow execution launch has been requested, start it
String flowId = argumentExtractor.extractFlowId(context);
@@ -182,14 +180,6 @@ public class FlowNavigationHandler extends DecoratingNavigationHandler {
}
}
private FlowDefinitionLocator getLocator(JsfExternalContext context) {
return FlowFacesUtils.getDefinitionLocator(context.getFacesContext());
}
private FlowExecutionFactory getFactory(JsfExternalContext context) {
return FlowFacesUtils.getExecutionFactory(context.getFacesContext());
}
/**
* Factory method that creates the input attribute map for a newly created
* {@link FlowExecution}. This implementation uses the registered input mapper,
@@ -207,4 +197,14 @@ public class FlowNavigationHandler extends DecoratingNavigationHandler {
return null;
}
}
// helpers
private FlowDefinitionLocator getLocator(JsfExternalContext context) {
return FlowFacesUtils.getDefinitionLocator(context.getFacesContext());
}
private FlowExecutionFactory getFactory(JsfExternalContext context) {
return FlowFacesUtils.getExecutionFactory(context.getFacesContext());
}
}

2
spring-webflow/src/main/java/org/springframework/webflow/executor/jsf/FlowPropertyResolver.java
View File

@@ -26,7 +26,7 @@ import org.springframework.web.jsf.FacesContextUtils;
import org.springframework.webflow.execution.FlowExecution;
/**
* Custom property resolve that resolves flow session scope attributes from the current flow execution. This resolver
* Custom property resolver that resolves flow session scope attributes of the current flow execution. This resolver
* will also create and set the attribute value to a bean from the root Spring Web Application Context if the value does
* not already exist, allowing for lazy-initialized binding variables.
*