[waffle-scm] [824] trunk/waffle-core/src/test/java/org/codehaus/waffle/i18n: WAFFLE-95: Renamed resource-related method methods to be valid for bundles as well as other resources containers.

Tue, 09 Sep 2008 15:21:27 -0700

Title: [waffle-scm] [824] trunk/waffle-core/src/test/java/org/codehaus/waffle/i18n: WAFFLE-95: Renamed resource-related method methods to be valid for bundles as well as other resources containers.

Diff

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

--- trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java	2008-09-09 10:28:30 UTC (rev 823)
+++ trunk/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerRegistrar.java	2008-09-09 12:45:47 UTC (rev 824)
@@ -51,7 +51,7 @@
         finder.registerConverter((ValueConverter) getRegistered(PersonValueConverter.class));
         finder.registerConverter((ValueConverter) getRegistered(PersonListValueConverter.class));
         MessageResources resources = registry.locateByType(MessageResources.class);
-        resources.useBundleName("FreemarkerResources");
+        resources.useResource("FreemarkerResources");
         resources.useLocale(Locale.ITALIAN);
         register("people/manage", PersonController.class);
         register("home", MenuAwareController.class);

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

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResources.java	2008-09-09 10:28:30 UTC (rev 823)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResources.java	2008-09-09 12:45:47 UTC (rev 824)
@@ -11,7 +11,7 @@
 import java.util.ResourceBundle;
 
 /**
- * Default ResourceBundle-based implementation of MessageResorces.
+ * Default [EMAIL PROTECTED] ResourceBundle}-based implementation of MessageResorces.
  * 
  * @author Michael Ward
  * @author Mauro Talevi
@@ -25,16 +25,16 @@
     }
 
     public DefaultMessageResources(MessageResourcesConfiguration configuration) {
-        bundleName = configuration.getResourceBundleName();
+        bundleName = configuration.getDefaultResource();
         userLocale = configuration.getDefaultLocale();
     }
 
-    public String getBundleName() {
+    public String getResource() {
         return bundleName;
     }
 
-    public void useBundleName(String bundleName) {
-        this.bundleName = bundleName;
+    public void useResource(String resource) {
+        this.bundleName = resource;
     }
 
     public Locale getLocale() {

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

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResourcesConfiguration.java	2008-09-09 10:28:30 UTC (rev 823)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResourcesConfiguration.java	2008-09-09 12:45:47 UTC (rev 824)
@@ -6,30 +6,30 @@
 import java.util.Locale;
 
 /**
- * Default MessageResourcesConfiguration
+ * Default MessageResourcesConfiguration which simply allows the injection of default locale and resource.
  * 
  * @author Mauro Talevi
  */
 public class DefaultMessageResourcesConfiguration implements MessageResourcesConfiguration {
 
     private final Locale defaultLocale;
-    private final String bundleName;
+    private final String defaultResource;
 
     public DefaultMessageResourcesConfiguration() {
         this(Locale.getDefault(), "ApplicationResources");
     }
 
-    public DefaultMessageResourcesConfiguration(Locale defaultLocale, String bundleName) {
+    public DefaultMessageResourcesConfiguration(Locale defaultLocale, String defaultResource) {
         this.defaultLocale = defaultLocale;
-        this.bundleName = bundleName;
+        this.defaultResource = defaultResource;
     }
 
     public Locale getDefaultLocale() {
         return defaultLocale;
     }
 
-    public String getResourceBundleName() {
-        return bundleName;
+    public String getDefaultResource() {
+        return defaultResource;
     }
 
 }

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

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResources.java	2008-09-09 10:28:30 UTC (rev 823)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResources.java	2008-09-09 12:45:47 UTC (rev 824)
@@ -6,16 +6,16 @@
 import java.util.Locale;
 
 /**
- * MessageResources represents messages for a given locale.
+ * Represents message resources for a given locale.
  * 
  * @author Michael Ward
  * @author Mauro Talevi
  */
 public interface MessageResources {
 
-    String getBundleName();
+    String getResource();
 
-    void useBundleName(String bundleName);
+    void useResource(String resource);
 
     Locale getLocale();

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

--- trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResourcesConfiguration.java	2008-09-09 10:28:30 UTC (rev 823)
+++ trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResourcesConfiguration.java	2008-09-09 12:45:47 UTC (rev 824)
@@ -5,9 +5,15 @@
 
 import java.util.Locale;
 
+/**
+ * Allows to retrieve the default resource and locale for message resources.
+ * 
+ * @author Michael Ward
+ * @author Mauro Talevi
+ */
 public interface MessageResourcesConfiguration {
 
-    String getResourceBundleName();
+    String getDefaultResource();
 
     Locale getDefaultLocale();
 }

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

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/AbstractValueConverterTest.java	2008-09-09 10:28:30 UTC (rev 823)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/AbstractValueConverterTest.java	2008-09-09 12:45:47 UTC (rev 824)
@@ -29,7 +29,7 @@
             return Locale.UK;
         }
 
-        public String getResourceBundleName() {
+        public String getDefaultResource() {
             return "FakeResourceBundle";
         }

Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/i18n/DefaultMessageResourcesTest.java (823 => 824)

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/i18n/DefaultMessageResourcesTest.java	2008-09-09 10:28:30 UTC (rev 823)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/i18n/DefaultMessageResourcesTest.java	2008-09-09 12:45:47 UTC (rev 824)
@@ -14,7 +14,7 @@
 public class DefaultMessageResourcesTest  {
 
     private MessageResourcesConfiguration configuration = new MessageResourcesConfiguration() {
-        public String getResourceBundleName() {
+        public String getDefaultResource() {
             return "FakeResourceBundle";
         }

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

--- trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubMessageResources.java	2008-09-09 10:28:30 UTC (rev 823)
+++ trunk/waffle-core/src/test/java/org/codehaus/waffle/testmodel/StubMessageResources.java	2008-09-09 12:45:47 UTC (rev 824)
@@ -21,10 +21,10 @@
         return null;
     }
 
-    public String getBundleName() {
+    public String getResource() {
         return null;
     }
 
-    public void useBundleName(String bundleName) {
+    public void useResource(String resource) {
     }
 }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to