svn commit: r547517 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java

[agilliland]

Author: agilliland
Date: Thu Jun 14 21:08:05 2007
New Revision: 547517

URL: http://svn.apache.org/viewvc?view=rev&rev=547517
Log:
fixing bug in pubtime conversion for blogs not in the jvm's default timezone.


Modified:
    
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java

Modified: 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java?view=diff&rev=547517&r1=547516&r2=547517
==============================================================================
--- 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
 (original)
+++ 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/struts2/editor/EntryBean.java
 Thu Jun 14 21:08:05 2007
@@ -220,10 +220,11 @@
             log.debug("pubtime vals are "+getDateString()+", "+getHours()+", 
"+getMinutes()+", "+getSeconds());
             
             // first convert the specified date string into an actual Date obj
-            DateFormat df = new SimpleDateFormat("MM/dd/yy", locale);
-            df.setTimeZone(timezone);
+            DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, 
locale);
             Date newDate = df.parse(getDateString());
             
+            log.debug("dateString yields date - "+newDate);
+            
             // Now handle the time from the hour, minute and second combos
             Calendar cal = Calendar.getInstance(locale);
             cal.setTime(newDate);
@@ -328,7 +329,7 @@
             setMinutes(cal.get(Calendar.MINUTE));
             setSeconds(cal.get(Calendar.SECOND));
             
-            DateFormat df = new SimpleDateFormat("MM/dd/yy", locale);
+            DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, 
locale);
             df.setTimeZone(entry.getWebsite().getTimeZoneInstance());
             setDateString(df.format(entry.getPubTime()));