Author: ddewolf
Date: Tue Jan 2 18:03:33 2007
New Revision: 492007
URL: http://svn.apache.org/viewvc?view=rev&rev=492007
Log:
WW-1591 OptionTransferSelect doubleSize not used
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java?view=diff&rev=492007&r1=492006&r2=492007
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/LotsOfOptiontransferselectAction.java
Tue Jan 2 18:03:33 2007
@@ -42,6 +42,9 @@
private List _favouriteCountriesKeys;
private List _notFavouriteCountriesKeys;
+ private List _favouriteSportsKeys;
+ private List _nonFavouriteSportsKeys;
+
private List _prioritisedFavouriteCartoonCharacters;
private List _prioritisedFavouriteCars;
private List _prioritisedFavouriteCountries;
@@ -188,6 +191,37 @@
_notFavouriteCountriesKeys = notFavouriteCountries;
}
+ // Sports
+ public Map getDefaultNonFavoriteSports() {
+ Map m = new LinkedHashMap();
+ m.put("basketball", "Basketball");
+ m.put("football", "Football");
+ m.put("baseball", "Baseball");
+ return m;
+ }
+
+ public Map getDefaultFavoriteSports() {
+ return new LinkedHashMap();
+ }
+
+ public List getFavouriteSports() {
+ return _favouriteSportsKeys;
+ }
+
+ public void setFavouriteSports(List favouriteSportsKeys) {
+ this._favouriteSportsKeys = favouriteSportsKeys;
+ }
+
+ public List getNonFavouriteSports() {
+ return _nonFavouriteSportsKeys;
+ }
+
+ public void setNonFavouriteSports(List notFavouriteSportsKeys) {
+ this._nonFavouriteSportsKeys = notFavouriteSportsKeys;
+ }
+
+
+
public List getPrioritisedFavouriteCartoonCharacters() {
return _prioritisedFavouriteCartoonCharacters;
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp?view=diff&rev=492007&r1=492006&r2=492007
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/lotsOfOptiontransferselect.jsp
Tue Jan 2 18:03:33 2007
@@ -68,8 +68,25 @@
/>
<br/>
-
- <s:updownselect
+
+ <s:optiontransferselect
+ tooltip="Pick One at a Time"
+ label="Favourite Sport"
+ leftTitle="Non Favourite Sports"
+ rightTitle="Favourite Sports"
+ name="nonFavouriteSports"
+ list="defaultNonFavoriteSports"
+ doubleName="favouriteSports"
+ doubleList="defaultFavouriteSports"
+ size="1" multiple="false"
+ doubleSize="5" doubleMultiple="true"
+ allowAddAllToLeft="false"
+ allowAddAllToRight="false"
+ allowSelectAll="false"
+ />
+ <br/>
+
+ <s:updownselect
tooltip="Prioritized Your Favourite Cartoon Characters"
label="Prioritised Favourite Cartoon Characters"
list="defaultFavouriteCartoonCharacters"
@@ -107,3 +124,4 @@
</s:form>
</body>
+</html>
\ No newline at end of file
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl?view=diff&rev=492007&r1=492006&r2=492007
==============================================================================
---
struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
(original)
+++
struts/struts2/trunk/core/src/main/resources/template/simple/optiontransferselect.ftl
Tue Jan 2 18:03:33 2007
@@ -170,7 +170,7 @@
<select
name="${parameters.doubleName?default("")?html}"
<#if parameters.get("doubleSize")?exists><#t/>
- size="${parameters.get("size")?html}"
+ size="${parameters.get("doubleSize")?html}"
</#if><#t/>
<#if parameters.doubleDisabled?default(false)><#t/>
disabled="disabled"
