svn commit: r658363 - /struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/DateTimePicker.java

[jmitchell]

Author: jmitchell
Date: Tue May 20 10:59:18 2008
New Revision: 658363

URL: http://svn.apache.org/viewvc?rev=658363&view=rev
Log:
WW-2567 Backported DateTimePicker thread safety issues.

Modified:
    
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/DateTimePicker.java

Modified: 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/DateTimePicker.java?rev=658363&r1=658362&r2=658363&view=diff
==============================================================================
--- 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
 (original)
+++ 
struts/struts2/branches/STRUTS_2_0_X/core/src/main/java/org/apache/struts2/components/DateTimePicker.java
 Tue May 20 10:59:18 2008
@@ -21,7 +21,9 @@
 package org.apache.struts2.components;
 
 import java.text.ParseException;
+import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.Date;
 
 import javax.servlet.http.HttpServletRequest;
@@ -129,8 +131,10 @@
 public class DateTimePicker extends UIBean {
 
     final public static String TEMPLATE = "datetimepicker";
-    final private static SimpleDateFormat RFC3339_FORMAT = new 
SimpleDateFormat(
-    "yyyy-MM-dd'T'HH:mm:ss");
+//  Backported changes from s2 trunk (r657936)
+//    final private static SimpleDateFormat RFC3339_FORMAT = new 
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+       final private static String RFC3339_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
+    final private static String RFC3339_PATTERN = "{0,date," + RFC3339_FORMAT 
+ "}";
     final protected static Log LOG = LogFactory.getLog(DateTimePicker.class);
     
     protected String iconPath;
@@ -294,12 +298,14 @@
             return null;
 
         if(obj instanceof Date) {
-            return RFC3339_FORMAT.format((Date) obj);
+            return MessageFormat.format(RFC3339_PATTERN, (Date) obj);
+        } else if(obj instanceof Calendar) {
+            return MessageFormat.format(RFC3339_PATTERN, ((Calendar) 
obj).getTime());
         } else {
             // try to parse a date
             String dateStr = obj.toString();
             if(dateStr.equalsIgnoreCase("today"))
-                return RFC3339_FORMAT.format(new Date());
+                return MessageFormat.format(RFC3339_PATTERN, new Date());
 
             try {
                 Date date = null;
@@ -307,7 +313,7 @@
                     SimpleDateFormat format = new SimpleDateFormat(
                             (String) getParameters().get("displayFormat"));
                     date = format.parse(dateStr);
-                    return RFC3339_FORMAT.format(date);
+                    return MessageFormat.format(RFC3339_PATTERN, date);
                 } else {
                     // last resource to assume already in correct/default 
format
                     return dateStr;