diff --git a/org.springframework.core/core.iml b/org.springframework.core/core.iml
index 0fd49c0c31..56886f27ac 100644
--- a/org.springframework.core/core.iml
+++ b/org.springframework.core/core.iml
@@ -1,211 +1,211 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.springframework.core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java b/org.springframework.core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java
index 1b29390098..9f7b390757 100644
--- a/org.springframework.core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java
+++ b/org.springframework.core/src/main/java/org/springframework/core/convert/converter/ConverterRegistry.java
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.springframework.core.convert.converter;
/**
@@ -35,9 +36,6 @@ public interface ConverterRegistry {
/**
* Add a generic converter to this registry.
- * @param sourceType the source type to convert from
- * @param targetType the target type to convert to
- * @param converter the generic converter
*/
void addGenericConverter(GenericConverter converter);
diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
index ea6460fab4..d6ec8ee1bd 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMapping.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.
@@ -19,20 +19,15 @@ package org.springframework.web.servlet.handler;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
-
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.BeanFactoryUtils;
-import org.springframework.core.OrderComparator;
import org.springframework.core.Ordered;
import org.springframework.web.context.request.WebRequestInterceptor;
import org.springframework.web.context.support.WebApplicationObjectSupport;
import org.springframework.web.servlet.HandlerExecutionChain;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.HandlerMapping;
-import org.springframework.web.servlet.ViewResolver;
/**
* Abstract base class for {@link org.springframework.web.servlet.HandlerMapping}
@@ -50,7 +45,7 @@ import org.springframework.web.servlet.ViewResolver;
* @see org.springframework.web.servlet.HandlerInterceptor
*/
public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
- implements HandlerMapping, Ordered {
+ implements HandlerMapping, Ordered {
private int order = Integer.MAX_VALUE; // default: same as non-Ordered
@@ -60,6 +55,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
private HandlerInterceptor[] adaptedInterceptors;
+
/**
* Specify the order value for this HandlerMapping bean.
*
Default value is Integer.MAX_VALUE, meaning that it's non-ordered.
@@ -102,6 +98,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
this.interceptors.addAll(Arrays.asList(interceptors));
}
+
/**
* Initializes the interceptors.
* @see #extendInterceptors(java.util.List)
@@ -123,7 +120,7 @@ public abstract class AbstractHandlerMapping extends WebApplicationObjectSupport
* allowing to add further interceptors before as well as after the existing
* interceptors
*/
- protected void extendInterceptors(List interceptors) {
+ protected void extendInterceptors(List