roller/src/org/roller/presentation MainPageAction.java,1.6,1.7 RollerContext.java,1.55,1.56 RollerSession.java,1.24,1.25 TurnoverReferersTask.java,1.1,1.2

Update of /cvsroot/roller/roller/src/org/roller/presentation
In directory sc8-pr-cvs1:/tmp/cvs-serv5432/src/org/roller/presentation

Modified Files:
        MainPageAction.java RollerContext.java RollerSession.java 
        TurnoverReferersTask.java 
Log Message:
Cleanups as recommended by Eclipse and PMD.

Index: MainPageAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/MainPageAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MainPageAction.java 1 Jun 2003 12:57:18 -0000       1.6
--- MainPageAction.java 3 Sep 2003 21:21:14 -0000       1.7
***************
*** 44,58 ****
          req.setAttribute("data",new Data(req));
          
-         String loggedInAs = null;
          boolean allowNewUsers = rctx.getRollerConfig().getNewUserAllowed();
          java.security.Principal prince = req.getUserPrincipal();
          if (prince != null) 
          {
!             req.setAttribute("loggedIn",new Boolean("true"));
              req.setAttribute("userName",prince.getName());
          } 
          else if (allowNewUsers)
          {   
!             req.setAttribute("allowNewUsers",new Boolean("true"));
          }
          
--- 44,57 ----
          req.setAttribute("data",new Data(req));
          
          boolean allowNewUsers = rctx.getRollerConfig().getNewUserAllowed();
          java.security.Principal prince = req.getUserPrincipal();
          if (prince != null) 
          {
!             req.setAttribute("loggedIn",Boolean.TRUE);
              req.setAttribute("userName",prince.getName());
          } 
          else if (allowNewUsers)
          {   
!             req.setAttribute("allowNewUsers",Boolean.TRUE);
          }
          
***************
*** 75,79 ****
          public List getPopularWebsites() throws RollerException
          {
-             HttpSession ses = mRequest.getSession(true);
              Roller roller= 
RollerRequest.getRollerRequest(mRequest).getRoller();
              
--- 74,77 ----
***************
*** 85,89 ****
          public List getRecentWeblogEntries() throws RollerException
          {
-             HttpSession ses = mRequest.getSession(true);
              Roller roller = 
RollerRequest.getRollerRequest(mRequest).getRoller();
                                    
--- 83,86 ----

Index: RollerContext.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/RollerContext.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** RollerContext.java  20 Aug 2003 01:34:10 -0000      1.55
--- RollerContext.java  3 Sep 2003 21:21:14 -0000       1.56
***************
*** 2,5 ****
--- 2,25 ----
  package org.roller.presentation;
  
+ import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
+ 
+ import org.apache.commons.lang.StringUtils;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.apache.struts.util.RequestUtils;
+ import org.roller.RollerException;
+ import org.roller.ThreadManager;
+ import org.roller.model.RefererManager;
+ import org.roller.model.Roller;
+ import org.roller.model.RollerFactory;
+ import org.roller.model.RollerSpellCheck;
+ import org.roller.pojos.RollerConfig;
+ import org.roller.pojos.UserData;
+ import org.roller.pojos.WeblogEntryData;
+ import org.roller.presentation.weblog.search.IndexManager;
+ import 
org.roller.presentation.weblog.search.operations.RebuildUserIndexOperation;
+ import org.roller.presentation.website.ThemeCache;
+ import org.roller.util.Utilities;
+ 
  import java.io.BufferedReader;
  import java.io.File;
***************
*** 22,45 ****
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpSessionEvent;
- 
- import org.apache.commons.lang.StringUtils;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- import org.apache.struts.util.RequestUtils;
- import org.roller.RollerException;
- import org.roller.ThreadManager;
- import org.roller.model.RefererManager;
- import org.roller.model.Roller;
- import org.roller.model.RollerFactory;
- import org.roller.model.RollerSpellCheck;
- import org.roller.pojos.RollerConfig;
- import org.roller.pojos.UserData;
- import org.roller.pojos.WeblogEntryData;
- import org.roller.presentation.weblog.search.IndexManager;
- import 
org.roller.presentation.weblog.search.operations.RebuildUserIndexOperation;
- import org.roller.presentation.website.ThemeCache;
- import org.roller.util.Utilities;
- 
- import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
  
  
--- 42,45 ----

Index: RollerSession.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/RollerSession.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** RollerSession.java  25 May 2003 13:11:08 -0000      1.24
--- RollerSession.java  3 Sep 2003 21:21:14 -0000       1.25
***************
*** 133,137 ****
          {
              // ignore purge exceptions
!             //logger.log("EXCEPTION PURGING session attributes",e);
          }
      }
--- 133,137 ----
          {
              // ignore purge exceptions
!             mLogger.debug("EXCEPTION PURGING session attributes",e);
          }
      }

Index: TurnoverReferersTask.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/TurnoverReferersTask.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TurnoverReferersTask.java   16 Aug 2003 23:26:45 -0000      1.1
--- TurnoverReferersTask.java   3 Sep 2003 21:21:14 -0000       1.2
***************
*** 7,12 ****
  package org.roller.presentation;
  
- import java.util.TimerTask;
- 
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
--- 7,10 ----
***************
*** 14,17 ****
--- 12,17 ----
  import org.roller.model.RefererManager;
  import org.roller.util.DateUtil;
+ 
+ import java.util.TimerTask;
  
  /**




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf