You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2001/10/14 00:44:09 UTC

cvs commit: jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/localization Localization.java LocalizationService.java TurbineLocalizationService.java

dlr         01/10/13 15:44:09

  Modified:    src/services/java/org/apache/fulcrum/localization
                        Localization.java LocalizationService.java
                        TurbineLocalizationService.java
  Log:
  Added some more JavaDoc and renamed getDefaultBundle() to getDefaultBundleName().
  
  Revision  Changes    Path
  1.11      +4 -4      jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/localization/Localization.java
  
  Index: Localization.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/localization/Localization.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -u -r1.10 -r1.11
  --- Localization.java	2001/10/13 22:32:51	1.10
  +++ Localization.java	2001/10/13 22:44:09	1.11
  @@ -83,7 +83,7 @@
    *
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: Localization.java,v 1.10 2001/10/13 22:32:51 dlr Exp $
  + * @version $Id: Localization.java,v 1.11 2001/10/13 22:44:09 dlr Exp $
    */
   public abstract class Localization
   {
  @@ -143,7 +143,7 @@
        */
       public static String getString(String key, String lang)
       {
  -        return Localization.getBundle(getDefaultBundle(), new Locale(lang, ""))
  +        return getBundle(getDefaultBundleName(), new Locale(lang, ""))
               .getString(key);
       }
   
  @@ -249,9 +249,9 @@
       /**
        * @see org.apache.fulcrum.localization.LocalizationService#getDefaultBundle()
        */
  -    public static String getDefaultBundle()
  +    public static String getDefaultBundleName()
       {
  -        return getService().getDefaultBundle();
  +        return getService().getDefaultBundleName();
       }
   
       /**
  
  
  
  1.5       +19 -3     jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/localization/LocalizationService.java
  
  Index: LocalizationService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/localization/LocalizationService.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -u -r1.4 -r1.5
  --- LocalizationService.java	2001/10/13 22:17:24	1.4
  +++ LocalizationService.java	2001/10/13 22:44:09	1.5
  @@ -61,10 +61,12 @@
   import org.apache.fulcrum.Service;
   
   /**
  - * Implementations of the LocalizationService interface.
  + * Provides localization functionality using the interface provided by
  + * <code>ResourceBundle</code>.
    *
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
  - * @version $Id: LocalizationService.java,v 1.4 2001/10/13 22:17:24 dlr Exp $
  + * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  + * @version $Id: LocalizationService.java,v 1.5 2001/10/13 22:44:09 dlr Exp $
    */
   public interface LocalizationService
       extends Service
  @@ -79,9 +81,23 @@
        */
       public static final String ACCEPT_LANGUAGE = "Accept-Language";
   
  +    /**
  +     * Retrieves the default language (as specified in the config
  +     * file).
  +     */
       public String getDefaultLanguage();
  +
  +    /**
  +     * Retrieves the default country (as specified in the config
  +     * file).
  +     */
       public String getDefaultCountry();
  -    public String getDefaultBundle();
  +
  +    /**
  +     * Retrieves the name of the default bundle (as specified in the
  +     * config file).
  +     */
  +    public String getDefaultBundleName();
   
       /**
        * Convenience method to get a default ResourceBundle.
  
  
  
  1.16      +4 -3      jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/localization/TurbineLocalizationService.java
  
  Index: TurbineLocalizationService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/localization/TurbineLocalizationService.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -u -r1.15 -r1.16
  --- TurbineLocalizationService.java	2001/10/13 22:14:22	1.15
  +++ TurbineLocalizationService.java	2001/10/13 22:44:09	1.16
  @@ -93,7 +93,7 @@
    * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
    * @author <a href="mailto:novalidemail@foo.com">Frank Y. Kim</a>
    * @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
  - * @version $Id: TurbineLocalizationService.java,v 1.15 2001/10/13 22:14:22 dlr Exp $
  + * @version $Id: TurbineLocalizationService.java,v 1.16 2001/10/13 22:44:09 dlr Exp $
    */
   public class TurbineLocalizationService
       extends BaseService
  @@ -168,9 +168,10 @@
       }
   
       /**
  -     * Retrieves the default bundle (specified in the config file).
  +     * Retrieves the name of the default bundle (as specified in the
  +     * config file).
        */
  -    public String getDefaultBundle()
  +    public String getDefaultBundleName()
       {
           return defaultBundle;
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org