From 0902929dd6a6726d5f7fc2bb62cec1019a5772cb Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Wed, 7 Mar 2007 02:20:44 +0000
Subject: [PATCH] WW-1607  Generate remote and static autocompleter from the
 same freemarker template  Fix autocompleter test

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@515424 13f79535-47bb-0310-9956-ffa450edef68
---
 .../resources/template/ajax/autocompleter.ftl | 38 +++++++++++++++++--
 .../dojo/views/jsp/ui/AutocompleterTest.java  |  1 -
 .../dojo/views/jsp/ui/Autocompleter-2.txt     |  2 +-
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl b/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
index b30c8c2ed..49db7ec22 100644
--- a/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/autocompleter.ftl
@@ -1,4 +1,9 @@
-<input dojoType="struts:ComboBox"<#rt/>
+<#if parameters.href?exists>
+  <input dojoType="struts:ComboBox"<#rt/>
+  dataUrl="${parameters.href}"<#rt/>
+<#else>
+  <select dojoType="struts:ComboBox"<#rt/>
+</#if>
 <#if parameters.id?if_exists != "">
  id="${parameters.id?html}"<#rt/>
 </#if>
@@ -8,9 +13,6 @@
 <#if parameters.cssStyle?if_exists != "">
  style="${parameters.cssStyle?html}"<#rt/>
 </#if>
-<#if parameters.href?if_exists != "">
- dataUrl="${parameters.href}"<#rt/>
-</#if>
 <#if parameters.forceValidOption?exists>
  forceValidOption="${parameters.forceValidOption?string?html}"<#rt/>
 </#if>
@@ -91,6 +93,34 @@
 </#if>
 <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 >
+<#if parameters.list?exists>
+	<#if (parameters.headerKey?exists && parameters.headerValue?exists)>
+		<option value="${parameters.headerKey?html}">${parameters.headerValue?html}</option>
+	</#if>
+	<#if parameters.emptyOption?default(false)>
+	    <option value=""></option>
+	</#if>
+    <@s.iterator value="parameters.list">
+    <#if parameters.listKey?exists>
+    	<#assign tmpListKey = stack.findString(parameters.listKey) />
+    <#else>
+    	<#assign tmpListKey = stack.findString('top') />
+    </#if>
+    <#if parameters.listValue?exists>
+    	<#assign tmpListValue = stack.findString(parameters.listValue) />
+    <#else>
+    	<#assign tmpListValue = stack.findString('top') />
+    </#if>
+    <option value="${tmpListKey?html}"<#rt/>
+        <#if (parameters.nameValue?exists && parameters.nameValue == tmpListKey)>
+ selected="selected"<#rt/>
+        </#if>
+    ><#t/>
+            ${tmpListValue?html}<#t/>
+    </option><#lt/>
+    </@s.iterator>
+  </select>    
+</#if>
 
 
 
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
index 425fc0550..ec3e438f5 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AutocompleterTest.java
@@ -60,7 +60,6 @@ public class AutocompleterTest extends AbstractUITagTest {
         tag.setDisabled("false");
         tag.setForceValidOption("false");
         tag.setList("{'d','e'}");
-        tag.setHref("a");
         tag.setDropdownWidth("10");
         tag.setDropdownHeight("10");
         tag.setDelay("100");
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt
index 97e944a53..b6bbb7e95 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Autocompleter-2.txt
@@ -1,7 +1,6 @@
 <select
  dojoType="struts:ComboBox"
  id="f"
- dataUrl="a"
  forceValidOption="false"
  searchType="B"
  autoComplete="true"
@@ -10,6 +9,7 @@
  dropdownHeight="10"
  name="f"
  keyName="fKey"
+ visibleDownArrow="true"
  buttonSrc="i"
  templateCssPath="j"
  >