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

fixed indexed property regression (SPR-6871)

This commit is contained in:
Juergen Hoeller 2010-02-20 15:53:09 +00:00
parent 5063c6dd00
commit 67b342d923
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractCheckedElementTag.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -77,7 +77,7 @@ public abstract class AbstractCheckedElementTag extends AbstractHtmlInputElement
*/ */
@Override @Override
protected String autogenerateId() throws JspException { protected String autogenerateId() throws JspException {
return TagIdGenerator.nextId(getName(), this.pageContext); return TagIdGenerator.nextId(super.autogenerateId(), this.pageContext);
} }

6
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/form/AbstractDataBoundFormElementTag.java
View File

@ -144,7 +144,7 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im
* deleting invalid characters (such as "[" or "]"). * deleting invalid characters (such as "[" or "]").
*/ */
protected String autogenerateId() throws JspException { protected String autogenerateId() throws JspException {
return getName(); return StringUtils.deleteAny(getName(), "[]");
} }
/** /**
@ -152,12 +152,12 @@ public abstract class AbstractDataBoundFormElementTag extends AbstractFormTag im
* <p>The default implementation simply delegates to * <p>The default implementation simply delegates to
* {@link #getPropertyPath()} to use the property path as the name. * {@link #getPropertyPath()} to use the property path as the name.
* For the most part this is desirable as it links with the server-side * For the most part this is desirable as it links with the server-side
* expectation for databinding. However, some subclasses may wish to change * expectation for data binding. However, some subclasses may wish to change
* the value of the '<code>name</code>' attribute without changing the bind path. * the value of the '<code>name</code>' attribute without changing the bind path.
* @return the value for the HTML '<code>name</code>' attribute * @return the value for the HTML '<code>name</code>' attribute
*/ */
protected String getName() throws JspException { protected String getName() throws JspException {
return StringUtils.deleteAny(getPropertyPath(), "[]"); return getPropertyPath();
} }
/** /**

2
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
View File

@ -96,7 +96,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
assertEquals("input", checkboxElement.getName()); assertEquals("input", checkboxElement.getName());
assertEquals("checkbox", checkboxElement.attribute("type").getValue()); assertEquals("checkbox", checkboxElement.attribute("type").getValue());
assertEquals("someMapkey1", checkboxElement.attribute("id").getValue()); assertEquals("someMapkey1", checkboxElement.attribute("id").getValue());
assertEquals("someMapkey", checkboxElement.attribute("name").getValue()); assertEquals("someMap[key]", checkboxElement.attribute("name").getValue());
assertEquals("checked", checkboxElement.attribute("checked").getValue()); assertEquals("checked", checkboxElement.attribute("checked").getValue());
assertEquals("true", checkboxElement.attribute("value").getValue()); assertEquals("true", checkboxElement.attribute("value").getValue());
} }