roller/src/org/roller/presentation/weblog/actions BakeWeblogAction.java,1.10,1.11 ReferersAction.java,1.14,1.15 ThemeEditorAction.java,1.17,1.18 ToggleLinkbackDisplayAction.java,1.9,1.10 WeblogEntryFormAction.java,1.43,1.44

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

Modified Files:
        BakeWeblogAction.java ReferersAction.java 
        ThemeEditorAction.java ToggleLinkbackDisplayAction.java 
        WeblogEntryFormAction.java 
Log Message:
Cleanups as recommended by Eclipse and PMD.

Index: BakeWeblogAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/BakeWeblogAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BakeWeblogAction.java       15 Aug 2003 23:26:01 -0000      1.10
--- BakeWeblogAction.java       3 Sep 2003 21:21:54 -0000       1.11
***************
*** 17,21 ****
  import org.roller.model.UserManager;
  import org.roller.pojos.PageData;
- import org.roller.pojos.WeblogEntryData;
  import org.roller.pojos.WebsiteData;
  import org.roller.presentation.RollerContext;
--- 17,20 ----
***************
*** 31,35 ****
  import java.io.StringWriter;
  import java.text.SimpleDateFormat;
- import java.util.ArrayList;
  import java.util.Date;
  import java.util.Iterator;
--- 30,33 ----

Index: ReferersAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/ReferersAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ReferersAction.java 16 Aug 2003 14:42:12 -0000      1.14
--- ReferersAction.java 3 Sep 2003 21:21:54 -0000       1.15
***************
*** 2,7 ****
  package org.roller.presentation.weblog.actions;
  
- import java.util.List;
- 
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
--- 2,5 ----
***************
*** 11,20 ****
  import org.apache.struts.actions.DispatchAction;
  import org.roller.model.RefererManager;
- import org.roller.pojos.RefererData;
  import org.roller.pojos.UserData;
  import org.roller.pojos.WebsiteData;
- import org.roller.presentation.RollerContext;
  import org.roller.presentation.RollerRequest;
  
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
--- 9,18 ----
  import org.apache.struts.actions.DispatchAction;
  import org.roller.model.RefererManager;
  import org.roller.pojos.UserData;
  import org.roller.pojos.WebsiteData;
  import org.roller.presentation.RollerRequest;
  
+ import java.util.List;
+ 
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServletRequest;
***************
*** 52,60 ****
          ActionForward forward = mapping.findForward("referers.page");
          RollerRequest rreq = RollerRequest.getRollerRequest(req);
-         RollerContext rctx = RollerContext.getRollerContext(
-             rreq.getServletContext() );
          HttpSession ses = req.getSession();
!             
!         String userName = rreq.getUser().getUserName();
          RefererManager refmgr = rreq.getRoller().getRefererManager();
          try
--- 50,55 ----
          ActionForward forward = mapping.findForward("referers.page");
          RollerRequest rreq = RollerRequest.getRollerRequest(req);
          HttpSession ses = req.getSession();
! 
          RefererManager refmgr = rreq.getRoller().getRefererManager();
          try

Index: ThemeEditorAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/ThemeEditorAction.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ThemeEditorAction.java      6 Jun 2003 20:30:52 -0000       1.17
--- ThemeEditorAction.java      3 Sep 2003 21:21:54 -0000       1.18
***************
*** 260,264 ****
                throws IOException, ServletException
        {
-               ActionErrors errors = new ActionErrors();
                ActionForward forward = mapping.findForward("editWebsite");
                try
--- 260,263 ----
***************
*** 271,281 ****
                                PageCache.removeFromCache( request, ud );
                  ThemeEditorForm teForm = (ThemeEditorForm)form;
-                 String theme = teForm.getThemeName();
-                 ServletContext ctx = rreq.getServletContext();
-                 RollerContext rollerContext = 
-                                 RollerContext.getRollerContext( ctx );
                                                                
                                // clear the places holding onto the template
-                               PageData page = getPage( rreq );
                                PreviewResourceLoader.clearAllTemplates( 
ud.getUserName() );
                                
request.getSession().removeAttribute(SESSION_TEMPLATE);
--- 270,275 ----

Index: ToggleLinkbackDisplayAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/ToggleLinkbackDisplayAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ToggleLinkbackDisplayAction.java    25 May 2003 13:11:07 -0000      1.9
--- ToggleLinkbackDisplayAction.java    3 Sep 2003 21:21:54 -0000       1.10
***************
*** 50,54 ****
                      RefererData ref = refmgr.retrieveReferer(refid);          
          
                      ref.setVisible( 
!                         new Boolean( !ref.getVisible().booleanValue() ));     
                  
                      refmgr.storeReferer(ref);
                      
--- 50,54 ----
                      RefererData ref = refmgr.retrieveReferer(refid);          
          
                      ref.setVisible( 
!                         Boolean.valueOf( !ref.getVisible().booleanValue() )); 
                      
                      refmgr.storeReferer(ref);
                      

Index: WeblogEntryFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/actions/WeblogEntryFormAction.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** WeblogEntryFormAction.java  16 Aug 2003 00:07:45 -0000      1.43
--- WeblogEntryFormAction.java  3 Sep 2003 21:21:54 -0000       1.44
***************
*** 2,19 ****
  package org.roller.presentation.weblog.actions;
  
! import java.io.IOException;
! import java.sql.Timestamp;
! import java.util.ArrayList;
! import java.util.List;
! import java.util.ListIterator;
! 
! import javax.servlet.ServletException;
! import javax.servlet.http.HttpServletRequest;
! import javax.servlet.http.HttpServletResponse;
! import javax.servlet.http.HttpSession;
  
  import org.apache.commons.lang.StringUtils;
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
--- 2,8 ----
  package org.roller.presentation.weblog.actions;
  
! import com.swabunga.spell.event.SpellCheckEvent;
  
  import org.apache.commons.lang.StringUtils;
  import org.apache.struts.action.ActionForm;
  import org.apache.struts.action.ActionForward;
***************
*** 40,44 ****
  import org.roller.presentation.xmlrpc.RollerXmlRpcClient;
  
! import com.swabunga.spell.event.SpellCheckEvent;
  
  
--- 29,42 ----
  import org.roller.presentation.xmlrpc.RollerXmlRpcClient;
  
! import java.io.IOException;
! import java.sql.Timestamp;
! import java.util.ArrayList;
! import java.util.List;
! import java.util.ListIterator;
! 
! import javax.servlet.ServletException;
! import javax.servlet.http.HttpServletRequest;
! import javax.servlet.http.HttpServletResponse;
! import javax.servlet.http.HttpSession;
  
  
***************
*** 52,58 ****
  public final class WeblogEntryFormAction extends DispatchAction
  {
-     private static Log mLogger = 
-         LogFactory.getFactory().getInstance(WeblogEntryFormAction.class);
- 
      //-----------------------------------------------------------------------
      /**
--- 50,53 ----
***************
*** 218,222 ****
                  
                  // Let edit action know that entry has been saved
!                 request.setAttribute("saved",new Boolean(true));
                  
                  // sendWeblogsPing wasn't getting set right when unchecked
--- 213,217 ----
                  
                  // Let edit action know that entry has been saved
!                 request.setAttribute("saved", Boolean.TRUE);
                  
                  // sendWeblogsPing wasn't getting set right when unchecked
***************
*** 352,356 ****
          {
              RollerRequest rreq = RollerRequest.getRollerRequest(request);
-             RollerContext rapp = RollerContext.getRollerContext(request);
              if ( rreq.isUserAuthorizedToEdit() )
              {
--- 347,350 ----




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