cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity TurbineUser.java

[dlr]

dlr         01/07/24 22:54:00

  Modified:    src/java/org/apache/turbine/services/security/impl/db/entity
                        TurbineUser.java
  Log:
  Clean up, minor optimizations, and code standards enforcement.
  
  Revision  Changes    Path
  1.7       +9 -10     
jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbineUser.java
  
  Index: TurbineUser.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/impl/db/entity/TurbineUser.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -u -r1.6 -r1.7
  --- TurbineUser.java  2001/07/25 05:44:56     1.6
  +++ TurbineUser.java  2001/07/25 05:54:00     1.7
  @@ -76,7 +76,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Craig D. Berry</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
  - * @version $Id: TurbineUser.java,v 1.6 2001/07/25 05:44:56 dlr Exp $
  + * @version $Id: TurbineUser.java,v 1.7 2001/07/25 05:54:00 dlr Exp $
    */
   public class TurbineUser
       extends org.apache.turbine.services.security.impl.db.entity.BaseTurbineUser
  @@ -190,15 +190,12 @@
       /**
        * The user is considered logged in if they have not timed out.
        *
  -     * @return True if the user has logged in.
  +     * @return Whether the user has logged in.
        */
       public boolean hasLoggedIn()
       {
  -        Boolean tmp = getHasLoggedIn();
  -        if (tmp != null && tmp.booleanValue())
  -            return true;
  -        else
  -            return false;
  +        Boolean loggedIn = getHasLoggedIn();
  +        return (loggedIn != null && loggedIn.booleanValue());
       }
   
       /**
  @@ -233,7 +230,9 @@
       public java.util.Date getLastAccessDate()
       {
           if (lastAccessDate == null)
  +        {
               setLastAccessDate();
  +        }
           return lastAccessDate;
       }
   
  @@ -270,9 +269,7 @@
           try
           {
               Object val = permStorage.get(name);
  -            if ( val == null )
  -                return def;
  -            return val;
  +            return (val == null ? def : val);
           }
           catch (Exception e)
           {
  @@ -367,7 +364,9 @@
       public Hashtable getTempStorage()
       {
           if (this.tempStorage == null)
  +        {
               this.tempStorage = new Hashtable();
  +        }
           return this.tempStorage;
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]