svn commit: r628216 - in /maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools: DefaultSiteTool.java SiteTool.java

[vsiveton]

Author: vsiveton
Date: Fri Feb 15 16:30:06 2008
New Revision: 628216

URL: http://svn.apache.org/viewvc?rev=628216&view=rev
Log:
o fixed due Benjamin's comment

Modified:
    
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
    
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java

Modified: 
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=628216&r1=628215&r2=628216&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
 (original)
+++ 
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
 Fri Feb 15 16:30:06 2008
@@ -971,6 +971,49 @@
         return localesList;
     }
 
+    /** [EMAIL PROTECTED] */
+    public Locale codeToLocale( String localeCode )
+    {
+        if ( localeCode == null )
+        {
+            return null;
+        }
+
+        if ( "default".equalsIgnoreCase( localeCode ) )
+        {
+            return Locale.getDefault();
+        }
+
+        String language = "";
+        String country = "";
+        String variant = "";
+
+        StringTokenizer tokenizer = new StringTokenizer( localeCode, "_" );
+        if ( tokenizer.countTokens() > 3 )
+        {
+            if ( getLogger().isWarnEnabled() )
+            {
+                getLogger().warn( "Invalid java.util.Locale format for '" + 
localeCode + "' entry - IGNORING" );
+            }
+            return null;
+        }
+
+        if ( tokenizer.hasMoreTokens() )
+        {
+            language = tokenizer.nextToken();
+            if ( tokenizer.hasMoreTokens() )
+            {
+                country = tokenizer.nextToken();
+                if ( tokenizer.hasMoreTokens() )
+                {
+                    variant = tokenizer.nextToken();
+                }
+            }
+        }
+
+        return new Locale( language, country, variant );
+    }
+
     // ----------------------------------------------------------------------
     // Private methods
     // ----------------------------------------------------------------------
@@ -1246,57 +1289,5 @@
     private static boolean isEmptyList( List list )
     {
         return list == null || list.isEmpty();
-    }
-
-    /**
-     * Converts a locale code like "en", "en_US" or "en_US_win" to a 
<code>java.util.Locale</code>
-     * object.
-     * <p>If localeCode = <code>default</code>, return the current value of 
the default locale for this instance
-     * of the Java Virtual Machine.</p>
-     *
-     * @param localeCode the locale code string.
-     * @return a java.util.Locale object instancied or null if errors occurred
-     * @see <a 
href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Locale.html";>java.util.Locale#getDefault()</a>
-     */
-    private Locale codeToLocale( String localeCode )
-    {
-        if ( localeCode == null )
-        {
-            return null;
-        }
-
-        if ( "default".equalsIgnoreCase( localeCode ) )
-        {
-            return Locale.getDefault();
-        }
-
-        String language = "";
-        String country = "";
-        String variant = "";
-
-        StringTokenizer tokenizer = new StringTokenizer( localeCode, "_" );
-        if ( tokenizer.countTokens() > 3 )
-        {
-            if ( getLogger().isWarnEnabled() )
-            {
-                getLogger().warn( "Invalid java.util.Locale format for '" + 
localeCode + "' entry - IGNORING" );
-            }
-            return null;
-        }
-
-        if ( tokenizer.hasMoreTokens() )
-        {
-            language = tokenizer.nextToken();
-            if ( tokenizer.hasMoreTokens() )
-            {
-                country = tokenizer.nextToken();
-                if ( tokenizer.hasMoreTokens() )
-                {
-                    variant = tokenizer.nextToken();
-                }
-            }
-        }
-
-        return new Locale( language, country, variant );
     }
 }

Modified: 
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java?rev=628216&r1=628215&r2=628216&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
 (original)
+++ 
maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/SiteTool.java
 Fri Feb 15 16:30:06 2008
@@ -221,4 +221,16 @@
      * @return a list of <code>Locale</code>
      */
     List getAvailableLocales( String locales );
+
+    /**
+     * Converts a locale code like "en", "en_US" or "en_US_win" to a 
<code>java.util.Locale</code>
+     * object.
+     * <p>If localeCode = <code>default</code>, return the current value of 
the default locale for this instance
+     * of the Java Virtual Machine.</p>
+     *
+     * @param localeCode the locale code string.
+     * @return a java.util.Locale object instancied or null if errors occurred
+     * @see <a 
href="http://java.sun.com/j2se/1.4.2/docs/api/java/util/Locale.html";>java.util.Locale#getDefault()</a>
+     */
+    Locale codeToLocale( String localeCode );
 }