svn commit: r722517 - in /velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view: MultiViewsTool.java i18n/MultiViewsTool.java

[nbubna]

Author: nbubna
Date: Tue Dec  2 08:38:19 2008
New Revision: 722517

URL: http://svn.apache.org/viewvc?rev=722517&view=rev
Log:
clean up the rather neglected $i18n a bit

Modified:
    
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/MultiViewsTool.java
    
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/i18n/MultiViewsTool.java

Modified: 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/MultiViewsTool.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/MultiViewsTool.java?rev=722517&r1=722516&r2=722517&view=diff
==============================================================================
--- 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/MultiViewsTool.java
 (original)
+++ 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/MultiViewsTool.java
 Tue Dec  2 08:38:19 2008
@@ -33,10 +33,10 @@
  * Apache httpd's <a
  * 
href="http://httpd.apache.org/docs-2.0/content-negotiation.html";>MultiViews</a>.
  *
- * <p>Reads the default language out of the ViewContext as
+ * <p>Reads the default language out of the ViewToolContext as
  * <code>org.apache.velocity.tools.view.i18n.defaultLanguage</code>.
- * See [EMAIL PROTECTED] #findLocalizedResource(String, String)} and [EMAIL 
PROTECTED]
- * #findLocalizedResource(String, Locale)} for usage.</p>
+ * See [EMAIL PROTECTED] #find(String, String)} and [EMAIL PROTECTED]
+ * #find(String, Locale)} for usage.</p>
  *
  * @version $Id$
  * @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a>
@@ -58,7 +58,6 @@
      * language.
      */
     protected String defaultLanguage;
-
     protected VelocityEngine engine;
 
     /**
@@ -95,25 +94,29 @@
     }
 
     /**
-     * Calls [EMAIL PROTECTED] #findLocalizedResource(String, String)} using 
the
+     * Calls [EMAIL PROTECTED] #find(String, String)} using the
      * language extracted from <code>locale</code>.
      *
-     * @see #findLocalizedResource(String, String)
+     * @see #find(String, String)
      */
-    public String findLocalizedResource(String name, Locale locale)
+    public String find(String name, Locale locale)
     {
-        return findLocalizedResource(name, locale.getLanguage());
+        if (locale == null)
+        {
+            return null;
+        }
+        return find(name, locale.getLanguage());
     }
 
     /**
-     * Calls [EMAIL PROTECTED] #findLocalizedResource(String, String)} using 
the
+     * Calls [EMAIL PROTECTED] #find(String, String)} using the
      * default language.
      *
-     * @see #findLocalizedResource(String, String)
+     * @see #find(String, String)
      */
-    public String findLocalizedResource(String name)
+    public String find(String name)
     {
-        return findLocalizedResource(name, defaultLanguage);
+        return find(name, defaultLanguage);
     }
 
     /**
@@ -124,9 +127,9 @@
      *
      * <p>Usage from a template would be something like the following:
      * <blockquote><code><pre>
-     * #parse ($multiviews.findLocalizedResource("header.vm", "en"))
-     * #include ($multiviews.findLocalizedResource("my_page.html", "en"))
-     * #parse ($multiviews.findLocalizedResource("footer.vm", "en"))
+     * #parse( $i18n.find('header.vm', 'en') )
+     * #include( $i18n.find('my_page.html', 'en') )
+     * #parse( $i18n.find('footer.vm', 'en') )
      * </pre></code></blockquote>
      *
      * You might also wrap this method using another pull/view tool
@@ -138,7 +141,7 @@
      * @return The localized file name, or <code>name</code> if it is
      * not localizable.
      */
-    public String findLocalizedResource(String name, String language)
+    public String find(String name, String language)
     {
         String localizedName = name + '.' + language;
         // templateExists() checks for static content as well

Modified: 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/i18n/MultiViewsTool.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/i18n/MultiViewsTool.java?rev=722517&r1=722516&r2=722517&view=diff
==============================================================================
--- 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/i18n/MultiViewsTool.java
 (original)
+++ 
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/i18n/MultiViewsTool.java
 Tue Dec  2 08:38:19 2008
@@ -19,6 +19,7 @@
  * under the License.
  */
 
+import java.util.Locale;
 import org.apache.velocity.tools.view.ViewToolContext;
 
 /**
@@ -35,4 +36,22 @@
             configure((ViewToolContext)obj);
         }
     }
+
+    @Deprecated
+    public String findLocalizedResource(String name, Locale locale)
+    {
+        return find(name, locale);
+    }
+
+    @Deprecated
+    public String findLocalizedResource(String name)
+    {
+        return find(name);
+    }
+
+    @Deprecated
+    public String findLocalizedResource(String name, String language)
+    {
+        return find(name, language);
+    }
 }