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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/02/28 01:19:01

  Modified:    src/main/org/jboss/seam/core    LocaleSelector.java
                        Selector.java TimeZoneSelector.java
  Log:
  fixed remember me
  
  Revision  Changes    Path
  1.19      +2 -2      jboss-seam/src/main/org/jboss/seam/core/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/core/LocaleSelector.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- LocaleSelector.java	21 Dec 2006 02:38:26 -0000	1.18
  +++ LocaleSelector.java	28 Feb 2007 06:19:01 -0000	1.19
  @@ -46,7 +46,7 @@
      @Create
      public void initLocale()
      {
  -      String localeString = getCookieValue();
  +      String localeString = getCookieValueIfEnabled();
         if (localeString!=null) setLocaleString(localeString);
      }
      
  @@ -66,7 +66,7 @@
         Contexts.removeFromAllContexts( Seam.getComponentName(ResourceBundle.class) );
         Contexts.removeFromAllContexts( Seam.getComponentName(Messages.class) );
         
  -      setCookieValue( getLocaleString() );
  +      setCookieValueIfEnabled( getLocaleString() );
   
         if ( Events.exists() ) {
             Events.instance().raiseEvent( "org.jboss.seam.localeSelected", getLocaleString() );
  
  
  
  1.3       +33 -12    jboss-seam/src/main/org/jboss/seam/core/Selector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Selector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Selector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Selector.java	2 Feb 2007 01:41:47 -0000	1.2
  +++ Selector.java	28 Feb 2007 06:19:01 -0000	1.3
  @@ -47,27 +47,48 @@
      /**
       * Get the value of the cookie
       */
  -   protected String getCookieValue()
  +   protected String getCookieValueIfEnabled()
      {
  -      Cookie cookie = null;
  +      return isCookieEnabled() ?
  +         getCookieValue() : null;
  +   }
         
  -      if ( isCookieEnabled() )
  +   protected Cookie getCookie()
         {
            FacesContext ctx = FacesContext.getCurrentInstance();
            if (ctx != null)
            {
  -            cookie = (Cookie) ctx.getExternalContext().getRequestCookieMap()
  +          return (Cookie) ctx.getExternalContext().getRequestCookieMap()
                  .get( getCookieName() );
            }
  +      else
  +      {
  +         return null;
  +      }
         }
         
  +   protected String getCookieValue()
  +   {
  +      Cookie cookie = getCookie();
         return cookie==null ? null : cookie.getValue();      
      }
      
  +   protected void clearCookieValue()
  +   {
  +      Cookie cookie = getCookie();
  +      if ( cookie!=null )
  +      {
  +         HttpServletResponse response = (HttpServletResponse) FacesContext.getCurrentInstance().getExternalContext().getResponse();         
  +         cookie.setValue(null);
  +         cookie.setMaxAge(0);
  +         response.addCookie(cookie);
  +      }
  +   }
  +   
      /**
       * Set the cookie
       */
  -   protected void setCookieValue(String value)
  +   protected void setCookieValueIfEnabled(String value)
      {
         if ( isCookieEnabled() )
         {
  
  
  
  1.10      +2 -2      jboss-seam/src/main/org/jboss/seam/core/TimeZoneSelector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TimeZoneSelector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/TimeZoneSelector.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- TimeZoneSelector.java	8 Jan 2007 03:28:04 -0000	1.9
  +++ TimeZoneSelector.java	28 Feb 2007 06:19:01 -0000	1.10
  @@ -31,7 +31,7 @@
      @Create
      public void initTimeZone()
      {
  -      String timeZoneId = getCookieValue();
  +      String timeZoneId = getCookieValueIfEnabled();
         if (timeZoneId!=null) setTimeZoneId(timeZoneId);
      }
      
  @@ -47,7 +47,7 @@
       */
      public void select()
      {
  -      setCookieValue( getTimeZoneId() );
  +      setCookieValueIfEnabled( getTimeZoneId() );
   
         if ( Events.exists() ) 
         {