Author: cbrisson
Date: Sun Nov 20 10:18:04 2016
New Revision: 1770546
URL: http://svn.apache.org/viewvc?rev=1770546&view=rev
Log:
[tools] ResourceTool inherit LocaleConfig: no need to declare a toLocale()
method
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
Modified:
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
URL:
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java?rev=1770546&r1=1770545&r2=1770546&view=diff
==============================================================================
---
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
(original)
+++
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
Sun Nov 20 10:18:04 2016
@@ -302,20 +302,6 @@ public class ResourceTool extends Locale
return master;
}
- private Locale toLocale(Object obj)
- {
- if (obj == null)
- {
- return null;
- }
- if (obj instanceof Locale)
- {
- return (Locale)obj;
- }
- String s = String.valueOf(obj);
- return ConversionUtils.toLocale(s);
- }
-
/**
* Renders the specified resource value and arguments as a String.
* The resource is treated as a {@link MessageFormat} pattern which
