Author: musachy
Date: Fri Sep 28 08:20:38 2007
New Revision: 580386
URL: http://svn.apache.org/viewvc?rev=580386&view=rev
Log:
WW-2220 Autocompleter tag does not provide a way to specify initial key value
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java?rev=580386&r1=580385&r2=580386&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Autocompleter.java
Fri Sep 28 08:20:38 2007
@@ -228,6 +228,7 @@
protected String resultsLimit;
protected String transport;
protected String preload;
+ protected String keyValue;
public Autocompleter(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
@@ -303,8 +304,13 @@
if (preload != null)
addParameter("preload", findValue(preload, Boolean.class));
- String keyNameExpr = "%{" + keyName + "}";
- addParameter("key", findString(keyNameExpr));
+ if (keyValue != null)
+ addParameter("nameKeyValue", findString(keyValue));
+ else {
+ String keyNameExpr = "%{" + keyName + "}";
+ addParameter("nameKeyValue", findString(keyNameExpr));
+ }
+
if (beforeNotifyTopics != null)
addParameter("beforeNotifyTopics", findString(beforeNotifyTopics));
@@ -506,5 +512,10 @@
@StrutsTagAttribute(description="Load options when page is loaded",
type="Boolean", defaultValue="true")
public void setPreload(String preload) {
this.preload = preload;
+ }
+
+ @StrutsTagAttribute(description="Initial key value")
+ public void setKeyValue(String keyValue) {
+ this.keyValue = keyValue;
}
}
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java?rev=580386&r1=580385&r2=580386&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTag.java
Fri Sep 28 08:20:38 2007
@@ -62,6 +62,7 @@
protected String resultsLimit;
protected String transport;
protected String preload;
+ protected String keyValue;
public Component getBean(ValueStack stack, HttpServletRequest req,
HttpServletResponse res) {
return new Autocompleter(stack, req, res);
@@ -98,6 +99,7 @@
autocompleter.setResultsLimit(resultsLimit);
autocompleter.setTransport(transport);
autocompleter.setPreload(preload);
+ autocompleter.setKeyValue(keyValue);
}
public void setAutoComplete(String autoComplete) {
@@ -210,5 +212,9 @@
public void setPreload(String preload) {
this.preload = preload;
+ }
+
+ public void setKeyValue(String keyValue) {
+ this.keyValue = keyValue;
}
}
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl?rev=580386&r1=580385&r2=580386&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
Fri Sep 28 08:20:38 2007
@@ -72,8 +72,8 @@
<#if parameters.nameValue?if_exists != "">
initialValue="${parameters.nameValue}"<#rt/>
</#if>
-<#if parameters.key?if_exists != "">
- initialKey="${parameters.key}"<#rt/>
+<#if parameters.nameKeyValue?if_exists != "">
+ initialKey="${parameters.nameKeyValue}"<#rt/>
</#if>
<#if parameters.readonly?default(false)>
readonly="readonly"<#rt/>
Modified:
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java?rev=580386&r1=580385&r2=580386&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
Fri Sep 28 08:20:38 2007
@@ -52,6 +52,7 @@
tag.setResultsLimit("2");
tag.setTransport("m");
tag.setPreload("true");
+ tag.setKeyValue("key");
tag.doStartTag();
tag.doEndTag();
Modified:
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt?rev=580386&r1=580385&r2=580386&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
(original)
+++
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-1.txt
Fri Sep 28 08:20:38 2007
@@ -11,6 +11,7 @@
name="f"
keyName="i"
initialValue="g"
+ initialKey="key"
valueNotifyTopics="l"
indicator="h"
loadOnType="true"
