You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/12/26 16:04:35 UTC
svn commit: r1052893 - in
/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl:
DefaultMessageContextConfig.java formatter/DefaultNumberFormatter.java
Author: gpetracek
Date: Sun Dec 26 15:04:34 2010
New Revision: 1052893
URL: http://svn.apache.org/viewvc?rev=1052893&view=rev
Log:
EXTCDI-108
Modified:
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContextConfig.java
myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/DefaultNumberFormatter.java
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContextConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContextConfig.java?rev=1052893&r1=1052892&r2=1052893&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/DefaultMessageContextConfig.java Sun Dec 26 15:04:34 2010
@@ -97,13 +97,13 @@ class DefaultMessageContextConfig implem
public MessageContextBuilder addFormatterConfig(Class<?> type, GenericConfig config)
{
- newMessageContextConfig.addNewFormatterConfig(type, config);
+ newMessageContextConfig.addNewFormatterConfig(type, config, Locale.getDefault());
return this;
}
public MessageContextBuilder addFormatterConfig(Class<?> type, GenericConfig config, Locale locale)
{
- addNewFormatterConfig(type, config.addProperty(Locale.class.toString(), locale));
+ addNewFormatterConfig(type, config.addProperty(Locale.class.toString(), locale), locale);
return this;
}
@@ -169,13 +169,13 @@ class DefaultMessageContextConfig implem
public MessageContextBuilder addFormatterConfig(Class<?> type, GenericConfig config)
{
- addNewFormatterConfig(type, config);
+ addNewFormatterConfig(type, config, Locale.getDefault());
return this;
}
public MessageContextBuilder addFormatterConfig(Class<?> type, GenericConfig config, Locale locale)
{
- addNewFormatterConfig(type, config.addProperty(Locale.class.toString(), locale));
+ addNewFormatterConfig(type, config.addProperty(Locale.class.toString(), locale), locale);
return this;
}
@@ -269,9 +269,9 @@ class DefaultMessageContextConfig implem
this.formatterFactory.add(formatter);
}
- private void addNewFormatterConfig(Class<?> type, GenericConfig config)
+ private void addNewFormatterConfig(Class<?> type, GenericConfig config, Locale locale)
{
- this.formatterFactory.addFormatterConfig(type, config);
+ this.formatterFactory.addFormatterConfig(type, config, locale);
}
private void addNewMessageHandler(MessageHandler messageHandler)
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/DefaultNumberFormatter.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/DefaultNumberFormatter.java?rev=1052893&r1=1052892&r2=1052893&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/DefaultNumberFormatter.java (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/message/impl/formatter/DefaultNumberFormatter.java Sun Dec 26 15:04:34 2010
@@ -94,13 +94,13 @@ class DefaultNumberFormatter implements
if (formatterConfig.containsProperty(NumberFormatterConfigKeys.GROUPING_SEPARATOR_KEY))
{
this.groupingSeparator = formatterConfig
- .getProperty(NumberFormatterConfigKeys.GROUPING_SEPARATOR_KEY, Character.class);
+ .getProperty(NumberFormatterConfigKeys.GROUPING_SEPARATOR_KEY, String.class).charAt(0);
}
if (formatterConfig.containsProperty(NumberFormatterConfigKeys.DECIMAL_SEPARATOR_KEY))
{
this.decimalSeparator = formatterConfig
- .getProperty(NumberFormatterConfigKeys.DECIMAL_SEPARATOR_KEY, Character.class);
+ .getProperty(NumberFormatterConfigKeys.DECIMAL_SEPARATOR_KEY, String.class).charAt(0);
}
if (formatterConfig.containsProperty(NumberFormatterConfigKeys.MINIMUM_FRACTION_DIGITS_KEY))