[waffle-scm] [823] trunk/examples/freemarker-example/src/main/resources: Allowed default message resource bundle and locale to be configured/overridden via the registrar.

Tue, 09 Sep 2008 14:43:49 -0700

Title: [waffle-scm] [823] trunk/examples/freemarker-example/src/main/resources: Allowed default message resource bundle and locale to be configured/overridden via the registrar.
Revision
823
Author
mauro
Date
2008-09-09 05:28:30 -0500 (Tue, 09 Sep 2008)

Log Message

Allowed default message resource bundle and locale to be configured/overridden via the registrar.


Modified Paths




Added Paths

Diff

Modified: trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java (822 => 823)

--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java	2008-09-09 10:28:30 UTC (rev 823)
@@ -6,6 +6,7 @@
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 
@@ -19,6 +20,7 @@
 import org.codehaus.waffle.example.freemarker.converters.PersonListValueConverter;
 import org.codehaus.waffle.example.freemarker.converters.PersonValueConverter;
 import org.codehaus.waffle.example.freemarker.persister.SimplePersonPersister;
+import org.codehaus.waffle.i18n.MessageResources;
 import org.codehaus.waffle.menu.Menu;
 import org.codehaus.waffle.menu.MenuAwareController;
 import org.codehaus.waffle.registrar.AbstractRegistrar;
@@ -48,6 +50,9 @@
         ValueConverterFinder finder = registry.locateByType(ValueConverterFinder.class);
         finder.registerConverter((ValueConverter) getRegistered(PersonValueConverter.class));
         finder.registerConverter((ValueConverter) getRegistered(PersonListValueConverter.class));
+        MessageResources resources = registry.locateByType(MessageResources.class);
+        resources.useBundleName("FreemarkerResources");
+        resources.useLocale(Locale.ITALIAN);
         register("people/manage", PersonController.class);
         register("home", MenuAwareController.class);
         registerInstance(createMenu());

Modified: trunk/examples/freemarker-example/src/main/resources/FreemarkerResources.properties (822 => 823)

--- trunk/examples/freemarker-example/src/main/resources/FreemarkerResources.properties	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/examples/freemarker-example/src/main/resources/FreemarkerResources.properties	2008-09-09 10:28:30 UTC (rev 823)
@@ -6,7 +6,16 @@
 # Other Error messages
 
 # Field Descriptions
+manageTitle=Select Person
+firstName=First
+lastName=Last
+email=Email
 dateOfBirth=Date of Birth
+type=Type
+skills=Skills
+select=Select
+create=New Person
+export=Export Selected
 
 # Other properties

Added: trunk/examples/freemarker-example/src/main/resources/FreemarkerResources_it.properties (0 => 823)

--- trunk/examples/freemarker-example/src/main/resources/FreemarkerResources_it.properties	                        (rev 0)
+++ trunk/examples/freemarker-example/src/main/resources/FreemarkerResources_it.properties	2008-09-09 10:28:30 UTC (rev 823)
@@ -0,0 +1,21 @@
+# Binding Error Messages
+bind.error.default=Il valore ''{1}'' nel campo <i>{0}</i> non e' valido.
+bind.error.number=Il valore ''{1}'' nel campo <i>{0}</i> non e' un numero valido.
+bind.error.date=Il valore "{1}" nel campo <i>{0}</i> non e' una data valida ({2}).
+
+# Other Error messages
+
+# Field Descriptions
+manageTitle=Seleziona un persona
+firstName=Nome
+lastName=Cognome
+email=Email
+dateOfBirth=Data di Nascita
+type=Tipo
+skills=Competenze
+select=Seleziona
+create=Nuova Persona
+export=Esporta Selezione
+
+# Other properties
+

Modified: trunk/examples/freemarker-example/src/main/webapp/people/manage.ftl (822 => 823)

--- trunk/examples/freemarker-example/src/main/webapp/people/manage.ftl	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/examples/freemarker-example/src/main/webapp/people/manage.ftl	2008-09-09 10:28:30 UTC (rev 823)
@@ -3,20 +3,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <title>Select a person</title>  
+    <title><@i.messageFor "manageTitle" "Select Person"/></title>  
 </head>
 <body>
 <#include "/navigation.ftl" parse="true">
 <div id="content">
 <form action="" method="post">
 
-    <h3>Waffle example: Select Person</h3>
+    <h3><@i.messageFor "manageTitle" "Select Person"/></h3>
 
     <table>
         <tr>
             <th>Id</th>
-            <th><@i.messageFor "firstName" "First"/></th>
-            <th><@i.messageFor "lastName" "Last"/></th>
+            <th><@i.messageFor "firstName" "First Name"/></th>
+            <th><@i.messageFor "lastName" "Last Name"/></th>
             <th><@i.messageFor "email" "Email"/></th>
             <th><@i.messageFor "dateOfBirth" "Date of Birth"/></th>
             <th><@i.messageFor "type" "Type"/></th>
@@ -39,10 +39,9 @@
         </#list>
     </table>
 
-    <a href="" <a href="" Selected</a>
+    <a href="" "create" "New"/></a>; <a href="" "export" "Export"/></a>
 
-    <div id="showArea">
-    	Selected people are:
+    <div id="showArea">    	
         <table>
         <#list selectedPeople as person>
 	        <tr class="odd">

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java (822 => 823)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoContextContainerFactory.java	2008-09-09 10:28:30 UTC (rev 823)
@@ -75,7 +75,11 @@
             getContextMonitor().requestContextContainerCreated(sessionContextContainer);
             return requestContextContainer;
         } finally {
-            messageResources.useLocale(request.getLocale());
+//TODO: setting the locale from the request (which will by default return the server default locale) 
+//      does not seem necessary given a default locale is already configured out-of-the-box 
+//      but more seriously it overrides any configuration set via the MessageResourcesConfiguration
+//      hence impeding any real configurability.  Need a clearer usecase for enabling this (MT)
+//            messageResources.useLocale(request.getLocale());
         }
     }

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResources.java (822 => 823)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResources.java	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResources.java	2008-09-09 10:28:30 UTC (rev 823)
@@ -17,8 +17,8 @@
  * @author Mauro Talevi
  */
 public class DefaultMessageResources implements MessageResources {
-    private final static ThreadLocal<Locale> userLocale = new ThreadLocal<Locale>();
-    public final String bundleName;
+    private Locale userLocale;
+    private String bundleName;
 
     public DefaultMessageResources() {
         this(new DefaultMessageResourcesConfiguration());
@@ -26,23 +26,31 @@
 
     public DefaultMessageResources(MessageResourcesConfiguration configuration) {
         bundleName = configuration.getResourceBundleName();
-        userLocale.set(configuration.getDefaultLocale());
+        userLocale = configuration.getDefaultLocale();
     }
 
+    public String getBundleName() {
+        return bundleName;
+    }
+
+    public void useBundleName(String bundleName) {
+        this.bundleName = bundleName;
+    }
+
     public Locale getLocale() {
-        return userLocale.get();
+        return userLocale;
     }
 
     public void useLocale(Locale locale) {
-        userLocale.set(locale);
+        userLocale = locale;
     }
 
-    public String getMessage(String key, Object ... arguments) {
-        ResourceBundle resourceBundle = getBundle(bundleName, userLocale.get());
+    public String getMessage(String key, Object... arguments) {
+        ResourceBundle resourceBundle = getBundle(bundleName, userLocale);
         return format(resourceBundle.getString(key), arguments);
     }
 
-    public String getMessageWithDefault(String key, String defaultValue, Object ... arguments) {
+    public String getMessageWithDefault(String key, String defaultValue, Object... arguments) {
         try {
             return getMessage(key, arguments);
         } catch (MissingResourceException e) {

Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResources.java (822 => 823)

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResources.java	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResources.java	2008-09-09 10:28:30 UTC (rev 823)
@@ -13,6 +13,10 @@
  */
 public interface MessageResources {
 
+    String getBundleName();
+
+    void useBundleName(String bundleName);
+
     Locale getLocale();
 
     void useLocale(Locale locale);

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/DateValueConverterTest.java (822 => 823)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/DateValueConverterTest.java	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/DateValueConverterTest.java	2008-09-09 10:28:30 UTC (rev 823)
@@ -25,6 +25,7 @@
 
 import org.codehaus.waffle.bind.BindException;
 import org.codehaus.waffle.i18n.DefaultMessageResources;
+import org.codehaus.waffle.i18n.MessageResources;
 import org.junit.Test;
 
 /**
@@ -53,7 +54,7 @@
 
     @Test
     public void canConvertWithDateFormatsConfiguredViaMessageResource() {
-        DefaultMessageResources resources = new DefaultMessageResources(configuration);
+        MessageResources resources = new DefaultMessageResources(configuration);
         AbstractValueConverter converter = new DateValueConverter(resources);
         assertDateFormattable("04-03-2008", resources.getMessage(DATE_FORMAT_KEY), converter.convertValue(
                 "property-name", "04-03-2008", Date.class));
@@ -86,7 +87,7 @@
 
     @Test
     public void canHandleMissingValues() {
-        DefaultMessageResources resources = new DefaultMessageResources(configuration);
+        MessageResources resources = new DefaultMessageResources(configuration);
         AbstractValueConverter converter = new DateValueConverter(resources);
         assertNull(converter.convertValue("property-name", null, Date.class));
         assertNull(converter.convertValue("property-name", "", Date.class));
@@ -95,7 +96,7 @@
 
     @Test
     public void canFailConversionWithCustomErrorMessages() {
-        DefaultMessageResources resources = new DefaultMessageResources(configuration);
+        MessageResources resources = new DefaultMessageResources(configuration);
         AbstractValueConverter converter = new DateValueConverter(resources);
         try {
             converter.convertValue("property-name", "bad-value", Date.class);

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberListValueConverterTest.java (822 => 823)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberListValueConverterTest.java	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/NumberListValueConverterTest.java	2008-09-09 10:28:30 UTC (rev 823)
@@ -15,6 +15,7 @@
 
 import org.codehaus.waffle.bind.BindException;
 import org.codehaus.waffle.i18n.DefaultMessageResources;
+import org.codehaus.waffle.i18n.MessageResources;
 import org.junit.Test;
 
 /**
@@ -80,7 +81,7 @@
 
     @Test
     public void canFailConversionWithCustomErrorMessages() {
-        DefaultMessageResources resources = new DefaultMessageResources(configuration);
+        MessageResources resources = new DefaultMessageResources(configuration);
         NumberListValueConverter converter = new NumberListValueConverter(resources) {
 
             @Override

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/StringListMapValueConverterTest.java (822 => 823)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/StringListMapValueConverterTest.java	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/StringListMapValueConverterTest.java	2008-09-09 10:28:30 UTC (rev 823)
@@ -21,6 +21,7 @@
 
 import org.codehaus.waffle.bind.BindException;
 import org.codehaus.waffle.i18n.DefaultMessageResources;
+import org.codehaus.waffle.i18n.MessageResources;
 import org.junit.Test;
 
 /**
@@ -96,7 +97,7 @@
 
     @Test
     public void canFailConversionWithCustomErrorMessages() {
-        DefaultMessageResources resources = new DefaultMessageResources(configuration);
+        MessageResources resources = new DefaultMessageResources(configuration);
         StringListMapValueConverter converter = new StringListMapValueConverter(resources) {
 
             @Override

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/StringListValueConverterTest.java (822 => 823)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/StringListValueConverterTest.java	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/StringListValueConverterTest.java	2008-09-09 10:28:30 UTC (rev 823)
@@ -15,6 +15,7 @@
 
 import org.codehaus.waffle.bind.BindException;
 import org.codehaus.waffle.i18n.DefaultMessageResources;
+import org.codehaus.waffle.i18n.MessageResources;
 import org.junit.Test;
 
 /**
@@ -67,7 +68,7 @@
 
     @Test
     public void canFailConversionWithCustomErrorMessages() {
-        DefaultMessageResources resources = new DefaultMessageResources(configuration);
+        MessageResources resources = new DefaultMessageResources(configuration);
         StringListValueConverter converter = new StringListValueConverter(resources) {
 
             @Override

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/StringNumberListMapValueConverterTest.java (822 => 823)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/StringNumberListMapValueConverterTest.java	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/StringNumberListMapValueConverterTest.java	2008-09-09 10:28:30 UTC (rev 823)
@@ -21,6 +21,7 @@
 
 import org.codehaus.waffle.bind.BindException;
 import org.codehaus.waffle.i18n.DefaultMessageResources;
+import org.codehaus.waffle.i18n.MessageResources;
 import org.junit.Test;
 
 /**
@@ -102,7 +103,7 @@
 
     @Test
     public void canFailConversionWithCustomErrorMessages() {
-        DefaultMessageResources resources = new DefaultMessageResources(configuration);
+        MessageResources resources = new DefaultMessageResources(configuration);
         StringNumberListMapValueConverter converter = new StringNumberListMapValueConverter(resources) {
 
             @Override

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java (822 => 823)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java	2008-09-09 10:28:30 UTC (rev 823)
@@ -109,7 +109,7 @@
             {
                 one(request).getSession();
                 will(returnValue(httpSession));
-                one(request).getLocale();
+                allowing(request).getLocale(); // allow, rather than mandate
                 will(returnValue(Locale.US));
             }
         });
@@ -315,7 +315,7 @@
             {
                 one(request).getSession();
                 will(returnValue(httpSession));
-                one(request).getLocale();
+                allowing(request).getLocale(); // allow, rather than mandate
                 will(returnValue(Locale.US));
             }
         });

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubMessageResources.java (822 => 823)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubMessageResources.java	2008-09-09 09:45:57 UTC (rev 822)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubMessageResources.java	2008-09-09 10:28:30 UTC (rev 823)
@@ -20,4 +20,11 @@
     public String getMessageWithDefault(String key, String defaultValue, Object ... arguments) {
         return null;
     }
+
+    public String getBundleName() {
+        return null;
+    }
+
+    public void useBundleName(String bundleName) {
+    }
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to