You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by ma...@apache.org on 2007/03/27 05:12:21 UTC
svn commit: r522754 - in /incubator/adffaces/trunk/trinidad:
trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
Author: matzew
Date: Mon Mar 26 22:12:20 2007
New Revision: 522754
URL: http://svn.apache.org/viewvc?view=rev&rev=522754
Log:
ADFFACES-410 DateTimeConverter does not use 2DigitYearStart() when parsing strings with year less than 4-digit
thanks Yee-Wah Lee (yee-wah.lee AT oracle DOT com) for her patch
Modified:
incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
Modified: incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java?view=diff&rev=522754&r1=522753&r2=522754
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java Mon Mar 26 22:12:20 2007
@@ -338,7 +338,7 @@
"value:\""+value+"\" is not of type java.util.Date," +
" it is "+value.getClass());
- DateFormat format = _getDateFormat(context, getPattern());
+ DateFormat format = _getDateFormat(context, getPattern(), false);
return format.format(value);
}
@@ -530,7 +530,7 @@
if (pattern == null)
{
// get the pattern based on the style and type that has been set.
- DateFormat format = getDateFormat(context, null);
+ DateFormat format = getDateFormat(context, null, true);
if (format instanceof SimpleDateFormat)
{
pattern = ((SimpleDateFormat)format).toPattern();
@@ -674,7 +674,7 @@
String pattern
)
{
- DateFormat fmt = getDateFormat(context, pattern);
+ DateFormat fmt = getDateFormat(context, pattern, true);
try
{
return fmt.parse(value);
@@ -1044,13 +1044,14 @@
protected final DateFormat getDateFormat(
FacesContext context,
- String pattern
+ String pattern,
+ boolean forParsing
) throws ConverterException
{
ConverterException exception = null;
try
{
- DateFormat format = _getDateFormat(context, pattern);
+ DateFormat format = _getDateFormat(context, pattern, forParsing);
return format;
}
catch (ConverterException ce)
@@ -1091,7 +1092,7 @@
try
{
- DateFormat format = getDateFormat(context, null);
+ DateFormat format = getDateFormat(context, null,false);
if ((format != null) && (format instanceof SimpleDateFormat))
{
datePattern = ((SimpleDateFormat)format).toPattern();
@@ -1341,7 +1342,7 @@
private String _getExample(FacesContext context, String pattern)
{
- DateFormat format = _getDateFormat(context, pattern);
+ DateFormat format = _getDateFormat(context, pattern, false);
return format.format(_EXAMPLE_DATE);
}
@@ -1577,7 +1578,8 @@
private DateFormat _getDateFormat(
FacesContext context,
- String pattern
+ String pattern,
+ boolean forParsing
)
{
RequestContext reqContext = RequestContext.getCurrentInstance();
@@ -1638,7 +1640,7 @@
format = _getSimpleDateFormat(pattern, locale);
}
- if (format instanceof SimpleDateFormat)
+ if (format instanceof SimpleDateFormat && !forParsing)
{
SimpleDateFormat simpleFormat = (SimpleDateFormat)format;
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java?view=diff&rev=522754&r1=522753&r2=522754
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java Mon Mar 26 22:12:20 2007
@@ -320,7 +320,7 @@
{
FacesContext context = FacesContext.getCurrentInstance();
// this the pattern obtained by applying the styles
- Object format = getDateFormat(context, null);
+ Object format = getDateFormat(context, null, false);
if (format instanceof SimpleDateFormat)
{
applyPattern = ((SimpleDateFormat) format).toPattern();
@@ -430,7 +430,7 @@
{
try
{
- DateFormat format = getDateFormat(context, datePattern);
+ DateFormat format = getDateFormat(context, datePattern, false);
if ((format != null) && (format instanceof SimpleDateFormat))
{
datePattern = ((SimpleDateFormat) format).toPattern();