diff options
author | Markus Koschany <apo@debian.org> | 2018-02-09 22:51:36 +0100 |
---|---|---|
committer | Markus Koschany <apo@debian.org> | 2018-02-09 22:51:36 +0100 |
commit | 6dc3d6835b664af0d21e774a5342b90d4417f628 (patch) | |
tree | c9f61a10de6abdffba88c8ea6d1dcab09c96603a /spring-webmvc/src/main/java/org | |
parent | 1cb0ad9c5dd218623094b3d6369be7a949094e8d (diff) |
New upstream version 4.3.14
Diffstat (limited to 'spring-webmvc/src/main/java/org')
2 files changed, 11 insertions, 8 deletions
diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMapMethodArgumentResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMapMethodArgumentResolver.java index 212a8269..ad2cea56 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMapMethodArgumentResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/MatrixVariableMapMethodArgumentResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -36,10 +36,13 @@ import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.HandlerMapping; /** - * Resolves method arguments of type Map annotated with - * {@link MatrixVariable @MatrixVariable} where the annotation does not - * specify a name. If a name is specified then the argument will by resolved by the - * {@link MatrixVariableMethodArgumentResolver} instead. + * Resolves arguments of type {@link Map} annotated with {@link MatrixVariable @MatrixVariable} + * where the annotation does not specify a name. In other words the purpose of this resolver + * is to provide access to multiple matrix variables, either all or associated with a specific + * path variable. + * + * <p>When a name is specified, an argument of type Map is considered to be a single attribute + * with a Map value, and is resolved by {@link MatrixVariableMethodArgumentResolver} instead. * * @author Rossen Stoyanchev * @since 3.2 @@ -103,4 +106,4 @@ public class MatrixVariableMapMethodArgumentResolver implements HandlerMethodArg return false; } -}
\ No newline at end of file +} diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java index cf1e2e6c..2c90aa5d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/LabelTag.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 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. @@ -93,7 +93,7 @@ public class LabelTag extends AbstractHtmlElementTag { } /** - * Overrides {@link #getName()} to always return {@code null}, + * Overrides {@code #getName()} to always return {@code null}, * because the '{@code name}' attribute is not supported by the * '{@code label}' tag. * @return the value for the HTML '{@code name}' attribute |