Author: snoopdave
Date: Fri Aug 10 09:41:23 2007
New Revision: 564669
URL: http://svn.apache.org/viewvc?view=rev&rev=564669
Log:
Fix for:
"JVM's default locale cause EntryAdd and EntryEdit set pubTime to updateTime
constantly"
http://opensource.atlassian.com/projects/roller/browse/ROL-1528
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=564669&r1=564668&r2=564669
==============================================================================
---
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
Fri Aug 10 09:41:23 2007
@@ -233,15 +233,17 @@
// TODO: at some point this date conversion should be locale
sensitive,
// however at this point our calendar widget does not take into
account
// locales and only operates in the standard English US locale.
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT);
+
+ // Don't require user add preceding '0' of month and day.
+ DateFormat df = new SimpleDateFormat("M/d/yy");
+ df.setTimeZone(timezone);
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);
+ Calendar cal = Calendar.getInstance(timezone,locale);
cal.setTime(newDate);
- cal.setTimeZone(timezone);
cal.set(Calendar.HOUR_OF_DAY, getHours());
cal.set(Calendar.MINUTE, getMinutes());
cal.set(Calendar.SECOND, getSeconds());
@@ -351,7 +353,7 @@
// TODO: at some point this date conversion should be locale
sensitive,
// however at this point our calendar widget does not take into
account
// locales and only operates in the standard English US locale.
- DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT);
+ DateFormat df = new SimpleDateFormat("MM/dd/yy");
df.setTimeZone(entry.getWebsite().getTimeZoneInstance());
setDateString(df.format(entry.getPubTime()));
