You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gc...@apache.org on 2008/03/21 22:46:11 UTC
svn commit: r639873 - in /myfaces/trinidad/trunk_1.2.x:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java
Author: gcrawford
Date: Fri Mar 21 14:46:10 2008
New Revision: 639873
URL: http://svn.apache.org/viewvc?rev=639873&view=rev
Log:
TRINIDAD-1020 Incomplete fix for TRINIDAD-61 (tr:validateDateTimeRange validation fails on last day of valid range)
Thanks to Yee Wah
Modified:
myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java
myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java?rev=639873&r1=639872&r2=639873&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java Fri Mar 21 14:46:10 2008
@@ -281,7 +281,12 @@
{
Date d = _parseISODate(expression.getValue(null));
Calendar c = Calendar.getInstance();
+ TimeZone tz = RequestContext.getCurrentInstance().getTimeZone();
+ if (tz != null)
+ c.setTimeZone(tz);
c.setTime(d);
+ // Original value had 00:00:00 for hours,mins, seconds now maximize those
+ // to get the latest time value for the date supplied.
c.set (Calendar.HOUR_OF_DAY, 23);
c.set (Calendar.MINUTE, 59);
c.set (Calendar.SECOND, 59);
Modified: myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java?rev=639873&r1=639872&r2=639873&view=diff
==============================================================================
--- myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java (original)
+++ myfaces/trinidad/trunk_1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java Fri Mar 21 14:46:10 2008
@@ -199,9 +199,14 @@
if (value instanceof Date)
return ((Date)value);
- Calendar c = Calendar.getInstance();
Date d = _parseISODate(value.toString());
+ Calendar c = Calendar.getInstance();
+ TimeZone tz = RequestContext.getCurrentInstance().getTimeZone();
+ if (tz != null)
+ c.setTimeZone(tz);
c.setTime(d);
+ // Original value had 00:00:00 for hours,mins, seconds now maximize those
+ // to get the latest time value for the date supplied.
c.set(Calendar.HOUR_OF_DAY, 23);
c.set(Calendar.MINUTE, 59);
c.set(Calendar.SECOND, 59);