You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2007/04/17 16:24:03 UTC
svn commit: r529622 - in /struts/struts2/branches/STRUTS_2_0_X/core/src:
main/java/org/apache/struts2/components/
main/java/org/apache/struts2/views/jsp/ui/
test/java/org/apache/struts2/views/jsp/ui/
Author: musachy
Date: Tue Apr 17 07:24:01 2007
New Revision: 529622
URL: http://svn.apache.org/viewvc?view=rev&rev=529622
Log:
WW-1886 Renaming attribute "searchLimit" to "resultsLimit" as it makes more sense
(the results are the one limited, not the search text)
Modified:
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java?view=diff&rev=529622&r1=529621&r2=529622
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/Autocompleter.java Tue Apr 17 07:24:01 2007
@@ -109,7 +109,7 @@
protected String iconPath;
protected String keyName;
protected String dataFieldName;
- protected String searchLimit;
+ protected String resultsLimit;
public Autocompleter(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
@@ -183,8 +183,8 @@
String keyNameExpr = "%{" + keyName + "}";
addParameter("key", findString(keyNameExpr));
- if(searchLimit != null)
- addParameter("searchLimit", findString(searchLimit));
+ if(resultsLimit != null)
+ addParameter("searchLimit", findString(resultsLimit));
}
protected Object findListValue() {
@@ -299,7 +299,7 @@
}
@StrutsTagAttribute(description="Limit how many results are shown as autocompletion options", defaultValue="30")
- public void setSearchLimit(String searchLimit) {
- this.searchLimit = searchLimit;
+ public void setResultsLimit(String resultsLimit) {
+ this.resultsLimit = resultsLimit;
}
}
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java?view=diff&rev=529622&r1=529621&r2=529622
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/views/jsp/ui/AutocompleterTag.java Tue Apr 17 07:24:01 2007
@@ -54,7 +54,7 @@
protected String iconPath;
protected String keyName;
protected String dataFieldName;
- protected String searchLimit;
+ protected String resultsLimit;
public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
return new Autocompleter(stack, req, res);
@@ -84,7 +84,7 @@
autocompleter.setIconPath(iconPath);
autocompleter.setKeyName(keyName);
autocompleter.setDataFieldName(dataFieldName);
- autocompleter.setSearchLimit(searchLimit);
+ autocompleter.setResultsLimit(resultsLimit);
}
public void setAutoComplete(String autoComplete) {
@@ -171,7 +171,7 @@
this.dataFieldName = dataFieldName;
}
- public void setSearchLimit(String searchLimit) {
- this.searchLimit = searchLimit;
+ public void setResultsLimit(String resultsLimit) {
+ this.resultsLimit = resultsLimit;
}
}
Modified: struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java
URL: http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java?view=diff&rev=529622&r1=529621&r2=529622
==============================================================================
--- struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java (original)
+++ struts/struts2/branches/STRUTS_2_0_X/core/src/test/java/org/apache/struts2/views/jsp/ui/AutocompleterTest.java Tue Apr 17 07:24:01 2007
@@ -50,7 +50,7 @@
tag.setIconPath("i");
tag.setTemplateCssPath("j");
tag.setDataFieldName("k");
- tag.setSearchLimit("1");
+ tag.setResultsLimit("1");
tag.doStartTag();
tag.doEndTag();
@@ -74,7 +74,7 @@
tag.setName("f");
tag.setIconPath("i");
tag.setTemplateCssPath("j");
- tag.setSearchLimit("1");
+ tag.setResultsLimit("1");
tag.doStartTag();
tag.doEndTag();