You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/11/11 19:30:23 UTC
svn commit: r1034024 -
/myfaces/commons/branches/jsf_11/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/TypedNumberConverter.java
Author: lu4242
Date: Thu Nov 11 18:30:22 2010
New Revision: 1034024
URL: http://svn.apache.org/viewvc?rev=1034024&view=rev
Log:
Sync with core (MYFACES-2970 f:convertNumber conversion is not symmetric when currencyCode and currencySymbol are used and MYFACES-1890 Numberconverter has issue with bigdecimal)
Modified:
myfaces/commons/branches/jsf_11/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/TypedNumberConverter.java
Modified: myfaces/commons/branches/jsf_11/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/TypedNumberConverter.java
URL: http://svn.apache.org/viewvc/myfaces/commons/branches/jsf_11/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/TypedNumberConverter.java?rev=1034024&r1=1034023&r2=1034024&view=diff
==============================================================================
--- myfaces/commons/branches/jsf_11/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/TypedNumberConverter.java (original)
+++ myfaces/commons/branches/jsf_11/myfaces-commons-converters/src/main/java/org/apache/myfaces/commons/converter/TypedNumberConverter.java Thu Nov 11 18:30:22 2010
@@ -176,16 +176,42 @@ public class TypedNumberConverter implem
{
NumberFormat format = getNumberFormat(facesContext);
format.setParseIntegerOnly(_integerOnly);
+
+ DecimalFormat df = (DecimalFormat)format;
+ //df.setParseBigDecimal(true);
+ DecimalFormatSymbols dfs = df.getDecimalFormatSymbols();
+ boolean changed = false;
+ if(dfs.getGroupingSeparator() == '\u00a0')
+ {
+ dfs.setGroupingSeparator(' ');
+ df.setDecimalFormatSymbols(dfs);
+ changed = true;
+ }
+
+ formatCurrency(format);
+
try
{
return format.parse(value);
}
catch (ParseException e)
{
+ if(changed)
+ {
+ dfs.setGroupingSeparator('\u00a0');
+ df.setDecimalFormatSymbols(dfs);
+ }
+ try
+ {
+ return format.parse(value);
+ }
+ catch (ParseException pe)
+ {
FacesMessage message = MessageUtils.getMessage(facesContext, CONVERSION_MESSAGE_ID, new Object[]{uiComponent.getId(),value});
message.setSeverity(FacesMessage.SEVERITY_ERROR);
throw new ConverterException(message, e);
+ }
}
}
}