- Revision
- 331
- Author
- mauro
- Date
- 2007-11-02 14:16:12 -0500 (Fri, 02 Nov 2007)
Log Message
Dropped Default from MessageResourcesConfiguration interface name - as it usually implies it being an implementation. Renamed MessageResources#useLocale() method from setLocale() to avoid suggesting an injection.
Modified Paths
- trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java
- trunk/core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResources.java
- trunk/core/src/main/java/org/codehaus/waffle/i18n/MessageResources.java
- trunk/core/src/test/java/org/codehaus/waffle/i18n/DefaultMessageResourcesTest.java
- trunk/core/src/test/java/org/codehaus/waffle/testmodel/StubMessageResources.java
Added Paths
Removed Paths
Diff
Modified: trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java (330 => 331)
--- trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java 2007-11-02 18:53:14 UTC (rev 330) +++ trunk/core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java 2007-11-02 19:16:12 UTC (rev 331) @@ -66,7 +66,7 @@ registrarAssistant.executeDelegatingRegistrar(createRegistrar(requestContextContainer), ContextLevel.REQUEST); return requestContextContainer; } finally { - messageResources.setLocale(request.getLocale()); + messageResources.useLocale(request.getLocale()); } }
Modified: trunk/core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResources.java (330 => 331)
--- trunk/core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResources.java 2007-11-02 18:53:14 UTC (rev 330) +++ trunk/core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResources.java 2007-11-02 19:16:12 UTC (rev 331) @@ -17,15 +17,15 @@ public class DefaultMessageResources implements MessageResources { private final static ThreadLocal<Locale> userLocale = new ThreadLocal<Locale>(); - public final String baseName; + public final String bundleName; public DefaultMessageResources() { - baseName = "ApplicationResources"; + bundleName = "ApplicationResources"; userLocale.set(Locale.getDefault()); } - public DefaultMessageResources(DefaultMessageResourcesConfiguration configuration) { - baseName = configuration.getResourceBundleBaseName(); + public DefaultMessageResources(MessageResourcesConfiguration configuration) { + bundleName = configuration.getResourceBundleName(); userLocale.set(configuration.getDefaultLocale()); } @@ -33,13 +33,13 @@ return userLocale.get(); } - public void setLocale(Locale locale) { + public void useLocale(Locale locale) { userLocale.set(locale); } public String getMessage(String key, Object ... arguments) { ResourceBundle resourceBundle = ResourceBundle - .getBundle(baseName, userLocale.get()); + .getBundle(bundleName, userLocale.get()); String message = resourceBundle.getString(key); return MessageFormat.format(message, arguments); }
Deleted: trunk/core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResourcesConfiguration.java (330 => 331)
--- trunk/core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResourcesConfiguration.java 2007-11-02 18:53:14 UTC (rev 330) +++ trunk/core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResourcesConfiguration.java 2007-11-02 19:16:12 UTC (rev 331) @@ -1,20 +0,0 @@ -/***************************************************************************** - * Copyright (C) 2005,2006 Michael Ward * - * All rights reserved. * - * ------------------------------------------------------------------------- * - * The software in this package is published under the terms of the BSD * - * style license a copy of which has been included with this distribution in * - * the LICENSE.txt file. * - * * - * Original code by: Michael Ward * - *****************************************************************************/ -package org.codehaus.waffle.i18n; - -import java.util.Locale; - -public interface DefaultMessageResourcesConfiguration { - - String getResourceBundleBaseName(); - - Locale getDefaultLocale(); -}
Modified: trunk/core/src/main/java/org/codehaus/waffle/i18n/MessageResources.java (330 => 331)
--- trunk/core/src/main/java/org/codehaus/waffle/i18n/MessageResources.java 2007-11-02 18:53:14 UTC (rev 330) +++ trunk/core/src/main/java/org/codehaus/waffle/i18n/MessageResources.java 2007-11-02 19:16:12 UTC (rev 331) @@ -12,12 +12,20 @@ import java.util.Locale; +/** + * MessageResources represents messages for a given locale. + * + * @author Michael Ward + * @author Mauro Talevi + */ public interface MessageResources { + Locale getLocale(); - void setLocale(Locale locale); + void useLocale(Locale locale); - String getMessage(String key, Object ... arguments); + String getMessage(String key, Object... arguments); - String getMessageWithDefault(String key, String defaultValue, Object ... arguments); + String getMessageWithDefault(String key, String defaultValue, Object... arguments); + }
Copied: trunk/core/src/main/java/org/codehaus/waffle/i18n/MessageResourcesConfiguration.java (from rev 328, trunk/core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResourcesConfiguration.java) (0 => 331)
--- trunk/core/src/main/java/org/codehaus/waffle/i18n/MessageResourcesConfiguration.java (rev 0) +++ trunk/core/src/main/java/org/codehaus/waffle/i18n/MessageResourcesConfiguration.java 2007-11-02 19:16:12 UTC (rev 331) @@ -0,0 +1,20 @@ +/***************************************************************************** + * Copyright (C) 2005,2006 Michael Ward * + * All rights reserved. * + * ------------------------------------------------------------------------- * + * The software in this package is published under the terms of the BSD * + * style license a copy of which has been included with this distribution in * + * the LICENSE.txt file. * + * * + * Original code by: Michael Ward * + *****************************************************************************/ +package org.codehaus.waffle.i18n; + +import java.util.Locale; + +public interface MessageResourcesConfiguration { + + String getResourceBundleName(); + + Locale getDefaultLocale(); +}
Modified: trunk/core/src/test/java/org/codehaus/waffle/i18n/DefaultMessageResourcesTest.java (330 => 331)
--- trunk/core/src/test/java/org/codehaus/waffle/i18n/DefaultMessageResourcesTest.java 2007-11-02 18:53:14 UTC (rev 330) +++ trunk/core/src/test/java/org/codehaus/waffle/i18n/DefaultMessageResourcesTest.java 2007-11-02 19:16:12 UTC (rev 331) @@ -6,8 +6,8 @@ public class DefaultMessageResourcesTest extends TestCase { - private DefaultMessageResourcesConfiguration configuration = new DefaultMessageResourcesConfiguration() { - public String getResourceBundleBaseName() { + private MessageResourcesConfiguration configuration = new MessageResourcesConfiguration() { + public String getResourceBundleName() { return "FakeResourceBundle"; } @@ -26,7 +26,7 @@ assertEquals("thoughtworks", messageResources.getMessage("company")); assertEquals("hello mars", messageResources.getMessage("foo.bar", "mars")); - messageResources.setLocale(Locale.UK); + messageResources.useLocale(Locale.UK); assertEquals("thoughtworks", messageResources.getMessage("company")); assertEquals("cheerio mars", messageResources.getMessage("foo.bar", "mars")); }
Modified: trunk/core/src/test/java/org/codehaus/waffle/testmodel/StubMessageResources.java (330 => 331)
--- trunk/core/src/test/java/org/codehaus/waffle/testmodel/StubMessageResources.java 2007-11-02 18:53:14 UTC (rev 330) +++ trunk/core/src/test/java/org/codehaus/waffle/testmodel/StubMessageResources.java 2007-11-02 19:16:12 UTC (rev 331) @@ -9,7 +9,7 @@ return null; } - public void setLocale(Locale locale) { + public void useLocale(Locale locale) { }
To unsubscribe from this list please visit:
