Author: musachy
Date: Tue Feb 27 18:48:06 2007
New Revision: 512580
URL: http://svn.apache.org/viewvc?view=rev&rev=512580
Log:
WW-1777 DateTimePicker now supports expressions in the property "displayFormat"
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java?view=diff&rev=512580&r1=512579&r2=512580
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
Tue Feb 27 18:48:06 2007
@@ -299,13 +299,13 @@
// try to parse a date
String dateStr = obj.toString();
if(dateStr.equalsIgnoreCase("today"))
- return RFC3339_FORMAT.format(new Date());
+ return RFC3339_FORMAT.format(new Date());
try {
Date date = null;
if(this.displayFormat != null) {
SimpleDateFormat format = new SimpleDateFormat(
- this.displayFormat);
+ (String) getParameters().get("displayFormat"));
date = format.parse(dateStr);
return RFC3339_FORMAT.format(date);
} else {
