From 677baaceb8d4418ce7c3950d485a5063f9d40205 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 13 Oct 2009 20:49:34 +0000 Subject: [PATCH] polishing --- .../web/portlet/bind/PortletRequestDataBinder.java | 8 ++++---- .../springframework/web/servlet/DispatcherServlet.java | 8 -------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java index f3b51ad7165..abeff33cf66 100644 --- a/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java +++ b/org.springframework.web.portlet/src/main/java/org/springframework/web/portlet/bind/PortletRequestDataBinder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2008 the original author or authors. + * Copyright 2002-2009 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,7 +21,7 @@ import javax.portlet.PortletRequest; import org.springframework.beans.MutablePropertyValues; import org.springframework.validation.BindException; import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.portlet.multipart.MultipartActionRequest; +import org.springframework.web.multipart.MultipartRequest; /** * Special {@link org.springframework.validation.DataBinder} to perform data binding @@ -105,8 +105,8 @@ public class PortletRequestDataBinder extends WebDataBinder { */ public void bind(PortletRequest request) { MutablePropertyValues mpvs = new PortletRequestParameterPropertyValues(request); - if (request instanceof MultipartActionRequest) { - MultipartActionRequest multipartRequest = (MultipartActionRequest) request; + if (request instanceof MultipartRequest) { + MultipartRequest multipartRequest = (MultipartRequest) request; bindMultipartFiles(multipartRequest.getFileMap(), mpvs); } doBind(mpvs); diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java index 7fe3a794075..d94b9907f84 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/DispatcherServlet.java @@ -139,7 +139,6 @@ public class DispatcherServlet extends FrameworkServlet { /** * Well-known name for the HandlerMapping object in the bean factory for this namespace. Only used when * "detectAllHandlerMappings" is turned off. - * * @see #setDetectAllHandlerMappings */ public static final String HANDLER_MAPPING_BEAN_NAME = "handlerMapping"; @@ -147,7 +146,6 @@ public class DispatcherServlet extends FrameworkServlet { /** * Well-known name for the HandlerAdapter object in the bean factory for this namespace. Only used when * "detectAllHandlerAdapters" is turned off. - * * @see #setDetectAllHandlerAdapters */ public static final String HANDLER_ADAPTER_BEAN_NAME = "handlerAdapter"; @@ -155,7 +153,6 @@ public class DispatcherServlet extends FrameworkServlet { /** * Well-known name for the HandlerExceptionResolver object in the bean factory for this namespace. Only used when * "detectAllHandlerExceptionResolvers" is turned off. - * * @see #setDetectAllHandlerExceptionResolvers */ public static final String HANDLER_EXCEPTION_RESOLVER_BEAN_NAME = "handlerExceptionResolver"; @@ -166,7 +163,6 @@ public class DispatcherServlet extends FrameworkServlet { /** * Well-known name for the ViewResolver object in the bean factory for this namespace. Only used when * "detectAllViewResolvers" is turned off. - * * @see #setDetectAllViewResolvers */ public static final String VIEW_RESOLVER_BEAN_NAME = "viewResolver"; @@ -177,28 +173,24 @@ public class DispatcherServlet extends FrameworkServlet { /** * Request attribute to hold the current web application context. Otherwise only the global web app context is * obtainable by tags etc. - * * @see org.springframework.web.servlet.support.RequestContextUtils#getWebApplicationContext */ public static final String WEB_APPLICATION_CONTEXT_ATTRIBUTE = DispatcherServlet.class.getName() + ".CONTEXT"; /** * Request attribute to hold the current LocaleResolver, retrievable by views. - * * @see org.springframework.web.servlet.support.RequestContextUtils#getLocaleResolver */ public static final String LOCALE_RESOLVER_ATTRIBUTE = DispatcherServlet.class.getName() + ".LOCALE_RESOLVER"; /** * Request attribute to hold the current ThemeResolver, retrievable by views. - * * @see org.springframework.web.servlet.support.RequestContextUtils#getThemeResolver */ public static final String THEME_RESOLVER_ATTRIBUTE = DispatcherServlet.class.getName() + ".THEME_RESOLVER"; /** * Request attribute to hold the current ThemeSource, retrievable by views. - * * @see org.springframework.web.servlet.support.RequestContextUtils#getThemeSource */ public static final String THEME_SOURCE_ATTRIBUTE = DispatcherServlet.class.getName() + ".THEME_SOURCE";