From 1b3f6102f60fbd857df74b6bd456a9018cd6fa85 Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Thu, 17 May 2007 20:19:02 +0000
Subject: [PATCH] WW-1752 cssStyle and cssClass are ignored in optiontransfer
 and doubleselect tags

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/branches/STRUTS_2_0_X@539100 13f79535-47bb-0310-9956-ffa450edef68
---
 core/src/main/resources/template/simple/doubleselect.ftl  | 8 ++++----
 .../resources/template/simple/optiontransferselect.ftl    | 8 ++++----
 .../org/apache/struts2/views/jsp/ui/DoubleSelectTest.java | 6 ++++++
 .../struts2/views/jsp/ui/OptionTransferSelectTagTest.java | 2 ++
 .../org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt    | 4 ++--
 .../struts2/views/jsp/ui/optiontransferselect-1.txt       | 2 ++
 6 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/core/src/main/resources/template/simple/doubleselect.ftl b/core/src/main/resources/template/simple/doubleselect.ftl
index 92dbb7439..9bb864f9a 100644
--- a/core/src/main/resources/template/simple/doubleselect.ftl
+++ b/core/src/main/resources/template/simple/doubleselect.ftl
@@ -19,11 +19,11 @@
 <#if parameters.doubleId?exists>
  id="${parameters.doubleId?html}"<#rt/>
 </#if>
-<#if parameters.cssClass?exists>
- class="${parameters.cssClass?html}"<#rt/>
+<#if parameters.doubleCss?exists>
+ class="${parameters.doubleCss?html}"<#rt/>
 </#if>
-<#if parameters.cssStyle?exists>
- style="${parameters.cssStyle?html}"<#rt/>
+<#if parameters.doubleStyle?exists>
+ style="${parameters.doubleStyle?html}"<#rt/>
 </#if>
 <#if parameters.title?exists>
  title="${parameters.title?html}"<#rt/>
diff --git a/core/src/main/resources/template/simple/optiontransferselect.ftl b/core/src/main/resources/template/simple/optiontransferselect.ftl
index 000a4c4de..3f0cf6ced 100644
--- a/core/src/main/resources/template/simple/optiontransferselect.ftl
+++ b/core/src/main/resources/template/simple/optiontransferselect.ftl
@@ -184,11 +184,11 @@
 	<#if parameters.doubleId?exists><#t/>
 	id="${parameters.doubleId?html}"
 	</#if><#t/>
-	<#if parameters.doubleCssClass?exists><#t/>
-	class="${parameters.doubleCssClass?html}"
+	<#if parameters.doubleCss?exists><#t/>
+	class="${parameters.doubleCss?html}"
 	</#if><#t/>
-	<#if parameters.doubleCssStyle?exists><#t/>
-	style="${parameters.doubleCssStyle?html}"
+	<#if parameters.doubleStyle?exists><#t/>
+	style="${parameters.doubleStyle?html}"
 	</#if><#t/>
     <#if parameters.doubleOnclick?exists><#t/>
     onclick="${parameters.doubleOnclick?html}"
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java
index 6eafe1082..44c0a5c4a 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/DoubleSelectTest.java
@@ -84,6 +84,12 @@ public class DoubleSelectTest extends AbstractUITagTest {
         tag.setOnmouseover("window.status='onmouseover';");
         tag.setOnmouseup("window.status='onmouseup';");
 
+        //css style and class
+        tag.setCssClass("c1");
+        tag.setCssStyle("s1");
+        tag.setDoubleCssClass("c2");
+        tag.setDoubleCssStyle("s2");
+        
         tag.doStartTag();
         tag.doEndTag();
 
diff --git a/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java b/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java
index 1a1af11ff..0c2c908a2 100644
--- a/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java
+++ b/core/src/test/java/org/apache/struts2/views/jsp/ui/OptionTransferSelectTagTest.java
@@ -60,6 +60,8 @@ public class OptionTransferSelectTagTest extends AbstractUITagTest {
         tag.setDoubleSize("20");
         tag.setMultiple("true");
         tag.setDoubleEmptyOption("true");
+        tag.setDoubleCssClass("c2");
+        tag.setDoubleCssStyle("s2");
 
         tag.setAllowAddAllToLeft("true");
         tag.setAllowAddAllToRight("true");
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
index b306be4ee..3d4b5b6fd 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
@@ -1,12 +1,12 @@
 <tr>
     <td class="tdLabel"><label for="foo" class="label">mylabel:</label></td>
     <td>
-<select name="foo" id="foo" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.options.selectedIndex)">
+<select name="foo" id="foo" class="c1" style="s1" onmousedown="window.status='onmousedown';" onmouseup="window.status='onmouseup';" onmouseover="window.status='onmouseover';" onmousemove="window.status='onmousemove';" onmouseout="window.status='onmouseout';" onchange="fooRedirect(this.options.selectedIndex)">
     <option value="BE">Belgium</option>
     <option value="FR">France</option>
 </select>
 <br/>
-<select name="region">
+<select name="region" class="c2" style="s2">
 </select>
 <script type="text/javascript">
     var fooGroup = new Array(2 + 0);
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt
index d207b84d3..6da0c34a8 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/optiontransferselect-1.txt
@@ -34,6 +34,8 @@
 		size="20"		
 		multiple="multiple"
 		id="doubleId"
+		class="c2"
+		style="s2"
 	>
     	<option value="Double Header Key">Double Header Value</option>
     	<option value=""></option>