[jboss-cvs] jboss-seam/src/main/org/jboss/seam/international ...

[Gavin King]

  User: gavin   
  Date: 07/07/10 06:23:20

  Modified:    src/main/org/jboss/seam/international    Locale.java
                        LocaleSelector.java
  Removed:     src/main/org/jboss/seam/international    ResourceBundle.java
  Log:
  move Locale back to core
  
  Revision  Changes    Path
  1.5       +11 -20    jboss-seam/src/main/org/jboss/seam/international/Locale.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Locale.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/Locale.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Locale.java	20 Jun 2007 17:45:56 -0000	1.4
  +++ Locale.java	10 Jul 2007 10:23:20 -0000	1.5
  @@ -1,8 +1,7 @@
   package org.jboss.seam.international;
   
  -import static org.jboss.seam.annotations.Install.BUILT_IN;
  +import static org.jboss.seam.annotations.Install.FRAMEWORK;
   
  -import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Install;
   import org.jboss.seam.annotations.Name;
  @@ -12,32 +11,24 @@
   import org.jboss.seam.contexts.Contexts;
   
   /**
  - * Manager component for the current user's locale
  + * Manager component for the current locale that is
  + * aware of the selected locale
    * 
    * @author Gavin King
    */
   @Scope(ScopeType.STATELESS)
  - at Name("org.jboss.seam.international.locale")
  - at Install(precedence=BUILT_IN, dependencies="org.jboss.seam.international.localeSelector")
  + at Name("org.jboss.seam.core.locale")
  + at Install(precedence=FRAMEWORK, dependencies="org.jboss.seam.international.localeSelector")
   @BypassInterceptors
  -public class Locale 
  +public class Locale extends org.jboss.seam.core.Locale
   {
   
  -   @Unwrap
  +   @Unwrap @Override
      public java.util.Locale getLocale()
      {
  -      return LocaleSelector.instance().getLocale();
  +      return Contexts.isSessionContextActive() ?
  +            LocaleSelector.instance().getLocale() :
  +            super.getLocale();
      }
        
  -   public static java.util.Locale instance()
  -   {
  -       if ( Contexts.isApplicationContextActive() ) 
  -       {
  -          return (java.util.Locale) Component.getInstance(Locale.class, ScopeType.STATELESS);
  -       } 
  -       else 
  -       {
  -          return java.util.Locale.US; // testing
  -       }
  -   }
   }
  \ No newline at end of file
  
  
  
  1.6       +1 -7      jboss-seam/src/main/org/jboss/seam/international/LocaleSelector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocaleSelector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/LocaleSelector.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- LocaleSelector.java	9 Jul 2007 06:31:28 -0000	1.5
  +++ LocaleSelector.java	10 Jul 2007 10:23:20 -0000	1.6
  @@ -12,11 +12,9 @@
   import javax.faces.event.ValueChangeEvent;
   import javax.faces.model.SelectItem;
   import javax.servlet.ServletRequest;
  -import javax.servlet.http.HttpServletRequest;
   
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
  -import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Install;
   import org.jboss.seam.annotations.Name;
  @@ -161,11 +159,7 @@
         ServletRequest request = ServletContexts.instance().getRequest();
         if (request!=null)
         {
  -         Locale requestLocale = ( (HttpServletRequest) request ).getLocale();
  -         if (requestLocale!=null)
  -         {
  -            return calculateLocale(requestLocale);
  -         }
  +         return calculateLocale( request.getLocale() );
         }
   
         return calculateLocale( Locale.getDefault() );