You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2006/06/01 17:22:58 UTC
svn commit: r410876 -
/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java
Author: matzew
Date: Thu Jun 1 08:22:58 2006
New Revision: 410876
URL: http://svn.apache.org/viewvc?rev=410876&view=rev
Log:
fixed breaking build ...
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java?rev=410876&r1=410875&r2=410876&view=diff
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/taglib/core/ConvertDateTimeTagBase.java Thu Jun 1 08:22:58 2006
@@ -92,24 +92,26 @@
DateTimeConverter converter,
String value)
{
+ Locale locale = null;
+ Object _value = null;
+
if (value == null) return;
if (UIComponentTag.isValueReference(value))
{
ValueBinding vb = facesContext.getApplication().createValueBinding(value);
- Locale locale = null;
- Object value = vb.getValue(facesContext);
- if(value instanceof Locale)
+ _value = vb.getValue(facesContext);
+ if(_value instanceof Locale)
{
- locale = (Locale) value;
+ locale = (Locale) _value;
}
else
{
- locale = LocaleUtils.converterTagLocaleFromString(value.toString());
+ locale = LocaleUtils.converterTagLocaleFromString(_value.toString());
}
}
else
{
- locale = LocaleUtils.converterTagLocaleFromString(value);
+ locale = LocaleUtils.converterTagLocaleFromString( value);
}
converter.setLocale(locale);
}
@@ -172,14 +174,14 @@
{
ValueBinding vb = facesContext.getApplication().createValueBinding(value);
TimeZone timeZone = null;
- Object value = vb.getValue(facesContext);
- if (value instanceof TimeZone)
+ Object _value = vb.getValue(facesContext);
+ if (_value instanceof TimeZone)
{
- timeZone = (TimeZone) value;
+ timeZone = (TimeZone) _value;
}
else
{
- timeZone = TimeZone.getTimeZone(value.toString());
+ timeZone = TimeZone.getTimeZone(_value.toString());
}
converter.setTimeZone(timeZone);
}