- Revision
- 840
- Author
- mauro
- Date
- 2008-09-15 11:47:35 -0500 (Mon, 15 Sep 2008)
Log Message
WAFFLE-97: Re-added but deprecated configuration methods for backward compatibility.
Modified Paths
Diff
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResourcesConfiguration.java (839 => 840)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResourcesConfiguration.java 2008-09-15 16:11:12 UTC (rev 839) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/DefaultMessageResourcesConfiguration.java 2008-09-15 16:47:35 UTC (rev 840) @@ -45,4 +45,12 @@ return uri; } + public Locale geDefaultLocale() { + return getLocale(); + } + + public String getDefaultResource() { + return getURI(); + } + }
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResourcesConfiguration.java (839 => 840)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResourcesConfiguration.java 2008-09-15 16:11:12 UTC (rev 839) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/i18n/MessageResourcesConfiguration.java 2008-09-15 16:47:35 UTC (rev 840) @@ -13,7 +13,17 @@ */ public interface MessageResourcesConfiguration { + /** + * @deprecated Use getURI() + */ + String getDefaultResource(); + String getURI(); + /** + * @deprecated Use getLocale() + */ + Locale geDefaultLocale(); + Locale getLocale(); }
Modified: trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/AbstractValueConverterTest.java (839 => 840)
--- trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/AbstractValueConverterTest.java 2008-09-15 16:11:12 UTC (rev 839) +++ trunk/waffle-core/src/test/java/org/codehaus/waffle/bind/converters/AbstractValueConverterTest.java 2008-09-15 16:47:35 UTC (rev 840) @@ -5,10 +5,10 @@ import static org.junit.Assert.assertTrue; import java.util.List; -import java.util.Locale; import java.util.Map; import org.codehaus.waffle.bind.ValueConverter; +import org.codehaus.waffle.i18n.DefaultMessageResourcesConfiguration; import org.codehaus.waffle.i18n.MessageResourcesConfiguration; /** @@ -23,18 +23,8 @@ protected static final List<String> STRINGS = asList("one", "two", "three"); protected static final List<String> MIXED_STRINGS = asList("0#.A", "1#.B"); - protected MessageResourcesConfiguration configuration = new MessageResourcesConfiguration() { + protected MessageResourcesConfiguration configuration = new DefaultMessageResourcesConfiguration("Bundle"); - public Locale getLocale() { - return Locale.UK; - } - - public String getURI() { - return "Bundle"; - } - - }; - protected void assertEmptyMap(ValueConverter converter, String value) { Map<?,?> map = (Map<?,?>) converter.convertValue("property-name", value, Map.class); assertNotNull(map);
To unsubscribe from this list please visit:
