root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

allow for null keys and null values in rendered Map (SPR-7024) 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3160 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Juergen Hoeller 2010-03-24 14:26:00 +00:00
parent 92bfb2d037
commit a45ba39399
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/OptionWriter.java
View File

@ -157,17 +157,17 @@ class OptionWriter {
* {@link Map} as the source. * {@link Map} as the source.
* @see #renderOption(TagWriter, Object, Object, Object) * @see #renderOption(TagWriter, Object, Object, Object)
*/ */
private void renderFromMap(final TagWriter tagWriter) throws JspException { private void renderFromMap(TagWriter tagWriter) throws JspException {
Map<?, ?> optionMap = (Map) this.optionSource; Map<?, ?> optionMap = (Map) this.optionSource;
for (Map.Entry entry : optionMap.entrySet()) { for (Map.Entry entry : optionMap.entrySet()) {
Object mapKey = entry.getKey(); Object mapKey = entry.getKey();
Object mapValue = entry.getValue(); Object mapValue = entry.getValue();
BeanWrapper mapKeyWrapper = PropertyAccessorFactory.forBeanPropertyAccess(mapKey); Object renderValue = (this.valueProperty != null ?
BeanWrapper mapValueWrapper = PropertyAccessorFactory.forBeanPropertyAccess(mapValue); PropertyAccessorFactory.forBeanPropertyAccess(mapKey).getPropertyValue(this.valueProperty) :
Object renderValue = (this.valueProperty != null ? mapKeyWrapper.getPropertyValue(this.valueProperty) : mapKey);
mapKey.toString()); Object renderLabel = (this.labelProperty != null ?
Object renderLabel = (this.labelProperty != null ? mapValueWrapper.getPropertyValue(this.labelProperty) : PropertyAccessorFactory.forBeanPropertyAccess(mapValue).getPropertyValue(this.labelProperty) :
mapValue.toString()); mapValue);
renderOption(tagWriter, mapKey, renderValue, renderLabel); renderOption(tagWriter, mapKey, renderValue, renderLabel);
} }
} }
@ -184,7 +184,7 @@ class OptionWriter {
* Renders the inner '<code>option</code>' tags using the {@link #optionSource}. * Renders the inner '<code>option</code>' tags using the {@link #optionSource}.
* @see #doRenderFromCollection(java.util.Collection, TagWriter) * @see #doRenderFromCollection(java.util.Collection, TagWriter)
*/ */
private void renderFromEnum(final TagWriter tagWriter) throws JspException { private void renderFromEnum(TagWriter tagWriter) throws JspException {
doRenderFromCollection(CollectionUtils.arrayToList(((Class) this.optionSource).getEnumConstants()), tagWriter); doRenderFromCollection(CollectionUtils.arrayToList(((Class) this.optionSource).getEnumConstants()), tagWriter);
} }