commit 410c9aff540a090c71742d38bb91e11a2393d969
author Claude Brisson <cbrisson@apache.org> Sun Nov 20 10:18:04 2016 +0000
committer Claude Brisson <cbrisson@apache.org> Sun Nov 20 10:18:04 2016 +0000
tree f2ae087e96983d967a20acb548be2bfb05947c15
parent c01c1a57ff9da6912c5c2cd076fc539311b47cc4

[tools] ResourceTool inherit LocaleConfig: no need to declare a toLocale() method

git-svn-id: https://svn.apache.org/repos/asf/velocity/tools/trunk@1770546 13f79535-47bb-0310-9956-ffa450edef68

velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java

diff --git a/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java b/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
index 0b0f7a8..62ca2b5 100644
--- a/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
+++ b/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/ResourceTool.java
@@ -302,20 +302,6 @@
         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