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

elimintated controller/handler adapter duplication

Browse Source 
made spring beanish with default constructor
This commit is contained in:
Keith Donald
2008-04-23 16:22:57 +00:00
parent f780171a1c
commit 40e02aa3a0
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-webflow/src/main/java/org/springframework/webflow/mvc/servlet/FlowHandlerAdapter.java
View File

@@ -54,6 +54,12 @@ public class FlowHandlerAdapter extends WebApplicationObjectSupport implements H
private static final Log logger = LogFactory.getLog(FlowHandlerAdapter.class);
private static final String SERVLET_PATH_LOCATION_PREFIX = "servletPath:";
private static final String CONTEXT_PATH_LOCATION_PREFIX = "contextPath:";
private static final String REDIRECT_URL_LOCATION_PREFIX = "redirectUrl:";
/**
* The entry point into Spring Web Flow.
*/
@@ -309,16 +315,16 @@ public class FlowHandlerAdapter extends WebApplicationObjectSupport implements H
}
private ModelAndView createRedirectView(String location, HttpServletRequest request) {
if (location.startsWith("servletPath:")) {
return createServletRelativeRedirect(location.substring("servletPath:".length()), request);
} else if (location.startsWith("contextPath:")) {
String contextUrl = location.substring("contextPath:".length());
if (location.startsWith(SERVLET_PATH_LOCATION_PREFIX)) {
return createServletRelativeRedirect(location.substring(SERVLET_PATH_LOCATION_PREFIX.length()), request);
} else if (location.startsWith(CONTEXT_PATH_LOCATION_PREFIX)) {
String contextUrl = location.substring(CONTEXT_PATH_LOCATION_PREFIX.length());
if (!contextUrl.startsWith("/")) {
contextUrl = "/" + contextUrl;
}
return new ModelAndView(new RedirectView(contextUrl, true));
} else if (location.startsWith("redirectUrl:")) {
return new ModelAndView(new RedirectView(location.substring("redirectUrl:".length())));
} else if (location.startsWith(REDIRECT_URL_LOCATION_PREFIX)) {
return new ModelAndView(new RedirectView(location.substring(REDIRECT_URL_LOCATION_PREFIX.length())));
} else {
return createServletRelativeRedirect(location, request);
}