Author: mrdon
Date: Fri Dec 8 00:22:32 2006
New Revision: 483877
URL: http://svn.apache.org/viewvc?view=rev&rev=483877
Log:
Fixed favourite color with different spellings, exposed uploaded file
WW-1538
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java?view=diff&rev=483877&r1=483876&r2=483877
==============================================================================
---
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/java/org/apache/struts2/showcase/UITagExample.java
Fri Dec 8 00:22:32 2006
@@ -44,7 +44,7 @@
String name;
Date birthday;
String bio;
- String favoriteColor;
+ String favouriteColor;
List friends;
boolean legalAge;
String state;
@@ -168,12 +168,12 @@
this.bio = bio;
}
- public String getFavoriteColor() {
- return favoriteColor;
+ public String getFavouriteColor() {
+ return favouriteColor;
}
- public void setFavoriteColor(String favoriteColor) {
- this.favoriteColor = favoriteColor;
+ public void setFavouriteColor(String favoriteColor) {
+ this.favouriteColor = favoriteColor;
}
public List getFriends() {
@@ -210,6 +210,10 @@
public void setPicture(File picture) {
this.picture = picture;
+ }
+
+ public File getPicture() {
+ return this.picture;
}
public void setPictureContentType(String pictureContentType) {
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp?view=diff&rev=483877&r1=483876&r2=483877
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/tags/ui/example.jsp Fri
Dec 8 00:22:32 2006
@@ -13,7 +13,7 @@
<s:fielderror />
-<s:form action="exampleSubmit" method="post" enctype="multipart/form-data"
tooltipConfig="#{'jsTooltipEnabled':'true'}">
+<s:form action="exampleSubmit" method="post" enctype="multipart/form-data"
tooltipConfig="%{'jsTooltipEnabled':'true'}">
<s:textfield
label="Name"
name="name"
@@ -35,7 +35,7 @@
tooltip="Choose Your Favourite Color"
label="Favorite Color"
list="{'Red', 'Blue', 'Green'}"
- name="favoriteColor"
+ name="favouriteColor"
emptyOption="true"
headerKey="None"
headerValue="None"/>
