roller/src/org/roller/presentation/velocity ContextLoader.java,1.6,1.7 Macros.java,1.73,1.74 PageModel.java,1.5,1.6 PreviewServlet.java,1.8,1.9 RollerServlet.java,1.20,1.21 SearchServlet.java,1.2,1.3

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

Modified Files:
        ContextLoader.java Macros.java PageModel.java 
        PreviewServlet.java RollerServlet.java SearchServlet.java 
Log Message:
Cleanups as recommended by Eclipse and PMD.

Index: ContextLoader.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/velocity/ContextLoader.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ContextLoader.java  3 Jun 2003 03:58:13 -0000       1.6
--- ContextLoader.java  3 Sep 2003 21:21:15 -0000       1.7
***************
*** 6,13 ****
  import org.apache.velocity.context.Context;
  import org.roller.RollerException;
- import org.roller.model.WeblogManager;
  import org.roller.pojos.RollerConfig;
  import org.roller.pojos.UserData;
- import org.roller.pojos.WeblogCategoryData;
  import org.roller.pojos.WeblogEntryData;
  import org.roller.pojos.WebsiteData;
--- 6,11 ----
***************
*** 15,19 ****
  import org.roller.presentation.RollerRequest;
  import org.roller.presentation.newsfeeds.NewsfeedCache;
- import org.roller.presentation.tags.menu.RollerMenuModel;
  import org.roller.presentation.weblog.formbeans.CommentFormEx;
  import org.roller.util.Utilities;
--- 13,16 ----
***************
*** 38,43 ****
  public class ContextLoader
  {             
!     private WeblogCategoryData[] mCategories = null;
!     private RollerMenuModel      mMenuModel = null;
      private PageContext          mPageContext = null;
      private HttpServletResponse  mResponse = null;       
--- 35,40 ----
  public class ContextLoader
  {             
!     //private WeblogCategoryData[] mCategories = null;
!     //private RollerMenuModel      mMenuModel = null;
      private PageContext          mPageContext = null;
      private HttpServletResponse  mResponse = null;       
***************
*** 46,50 ****
      private Context              mVelocityContext = null; // Velocity Context 
  
      
!     // TODO Make this configurable
      static List mPlugins = new ArrayList();
      static
--- 43,47 ----
      private Context              mVelocityContext = null; // Velocity Context 
  
      
!     // TODO Make Plugins configurable
      static List mPlugins = new ArrayList();
      static
***************
*** 173,181 ****
          
          // Add comments related values to context
!         ctx.put("isCommentPage",new Boolean(true));
!         ctx.put("escapeHtml",
!             new Boolean(rollerConfig.getEscapeCommentHtml()));
!         ctx.put("autoformat",
!             new Boolean(rollerConfig.getAutoformatComments()));
          
          // Make sure comment form object is available in context
--- 170,178 ----
          
          // Add comments related values to context
!         ctx.put("isCommentPage", Boolean.TRUE);
!         ctx.put("escapeHtml", Boolean.valueOf(
!             rollerConfig.getEscapeCommentHtml()) );
!         ctx.put("autoformat", Boolean.valueOf(
!             rollerConfig.getAutoformatComments()) );
          
          // Make sure comment form object is available in context
***************
*** 201,210 ****
              ctx.put("previewComments",list);            
          }
!         else // Or the whole set of commeng for the specified weblog entry
          {
              WeblogEntryData entry = rreq.getWeblogEntry();
              entry.setRoller(rreq.getRoller());
              
-             WeblogManager wmgr = rreq.getRoller().getWeblogManager();
              ctx.put("entry",entry);            
          }
--- 198,206 ----
              ctx.put("previewComments",list);            
          }
!         else // Or the whole set of comment for the specified weblog entry
          {
              WeblogEntryData entry = rreq.getWeblogEntry();
              entry.setRoller(rreq.getRoller());
              
              ctx.put("entry",entry);            
          }
***************
*** 327,333 ****
          Context ctx, RollerRequest rreq, RollerContext rollerCtx )
      {
-         HttpServletRequest request = rreq.getRequest();
          String userName = null;
-         String fullName = null;
          WebsiteData site = null;
          if ( rreq.getUser() != null )
--- 323,327 ----

Index: Macros.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/velocity/Macros.java,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** Macros.java 16 Aug 2003 14:42:13 -0000      1.73
--- Macros.java 3 Sep 2003 21:21:15 -0000       1.74
***************
*** 112,116 ****
          String date = null;
          Date updateTime = getUpdateTime(weblogEntries);
-         Iterator iter = weblogEntries.iterator();
          try
          {
--- 112,115 ----
***************
*** 531,540 ****
          String links = "ERROR: creating RSS links";
          try
!         {
!             HttpServletRequest req =
!                 (HttpServletRequest)mPageContext.getRequest();
!             HttpServletResponse res =
!                 (HttpServletResponse)mPageContext.getResponse();
!                 
              RollerRequest rreq = getRollerRequest();
              RollerContext rctx = RollerContext.getRollerContext(
--- 530,534 ----
          String links = "ERROR: creating RSS links";
          try
!         {                
              RollerRequest rreq = getRollerRequest();
              RollerContext rctx = RollerContext.getRollerContext(
***************
*** 766,773 ****
          String alt, int border, String halign, String valign )
      {
-         HttpServletRequest request =
-             (HttpServletRequest) mPageContext.getRequest();
-         ServletContext app = mPageContext.getServletContext();
- 
          StringBuffer sb = new StringBuffer();
          if ( linkUrl!=null && linkUrl.trim().length()>0 )
--- 760,763 ----
***************
*** 860,865 ****
          StringBuffer sb = new StringBuffer();
          sb.append( request.getContextPath());
!         sb.append( "/themes/"); // TODO Add configuration for theme path
!         sb.append( theme);
          return sb.toString();
      }
--- 850,858 ----
          StringBuffer sb = new StringBuffer();
          sb.append( request.getContextPath());
!         sb.append( 
!             RollerContext.getRollerContext(request).
!                 getRollerConfig().getNewUserThemes());
!         sb.append( "/" );
!         sb.append( theme );
          return sb.toString();
      }
***************
*** 874,879 ****
      public String showThemeImagePath( String theme, String imageName )
      {
-         HttpServletRequest request =
-             (HttpServletRequest)mPageContext.getRequest();
          StringBuffer sb = new StringBuffer();
          sb.append( showThemePath(theme));
--- 867,870 ----
***************
*** 892,897 ****
      public String showThemeImage( String theme, String imageName )
      {
-         HttpServletRequest request =
-             (HttpServletRequest)mPageContext.getRequest();
          StringBuffer sb = new StringBuffer();
          sb.append( "<img alt=\""+imageName+"\" src=\"");
--- 883,886 ----
***************
*** 910,915 ****
      public String showThemeStylePath( String theme, String stylesheet )
      {
-         HttpServletRequest request =
-             (HttpServletRequest)mPageContext.getRequest();
          StringBuffer sb = new StringBuffer();
          sb.append( showThemePath(theme));
--- 899,902 ----
***************
*** 930,935 ****
          String theme, String stylesheet, boolean useImport )
      {
-         HttpServletRequest request =
-             (HttpServletRequest)mPageContext.getRequest();
          StringBuffer sb = new StringBuffer();
          if (useImport) {
--- 917,920 ----
***************
*** 968,973 ****
      public String showThemeScriptPath( String theme, String scriptFile )
      {
-         HttpServletRequest request =
-             (HttpServletRequest)mPageContext.getRequest();
          StringBuffer sb = new StringBuffer();
          sb.append( showThemePath(theme));
--- 953,956 ----
***************
*** 990,995 ****
      public String showThemeScript( String theme, String scriptFile)
      {
-         HttpServletRequest request =
-             (HttpServletRequest)mPageContext.getRequest();
          StringBuffer sb = new StringBuffer();
          sb.append( "<script type=\"text/javascript\" src=\"");
--- 973,976 ----

Index: PageModel.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/velocity/PageModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PageModel.java      16 Aug 2003 14:42:13 -0000      1.5
--- PageModel.java      3 Sep 2003 21:21:15 -0000       1.6
***************
*** 15,22 ****
  import org.roller.pojos.PageData;
  import org.roller.pojos.RefererData;
- import org.roller.pojos.WeblogCategoryData;
  import org.roller.pojos.WeblogEntryData;
  import org.roller.presentation.RollerRequest;
- import org.roller.presentation.newsfeeds.NewsfeedCache;
  
  import java.util.ArrayList;
--- 15,20 ----
***************
*** 49,54 ****
      private RefererManager       mRefererMgr = null;
  
!       private List                             mCategories = null;
!       private NewsfeedCache        mNewsfeedCache = null;
        private PageContext          mPageContext = null;
        private HashMap              mPageMap = new HashMap();
--- 47,51 ----
      private RefererManager       mRefererMgr = null;
  
!       private List                              mCategories = null;
        private PageContext          mPageContext = null;
        private HashMap              mPageMap = new HashMap();

Index: PreviewServlet.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/velocity/PreviewServlet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PreviewServlet.java 25 May 2003 20:44:33 -0000      1.8
--- PreviewServlet.java 3 Sep 2003 21:21:15 -0000       1.9
***************
*** 2,7 ****
  package org.roller.presentation.velocity;
  
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
  import org.apache.velocity.Template;
  import org.apache.velocity.context.Context;
--- 2,5 ----
***************
*** 19,25 ****
  public class PreviewServlet extends RollerServlet
  {
-       private static Log mLogger = 
-               LogFactory.getFactory().getInstance(PreviewServlet.class);
- 
      public Template handleRequest( HttpServletRequest request,
                                      HttpServletResponse response, 
--- 17,20 ----

Index: RollerServlet.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/velocity/RollerServlet.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** RollerServlet.java  1 Jun 2003 12:57:01 -0000       1.20
--- RollerServlet.java  3 Sep 2003 21:21:15 -0000       1.21
***************
*** 53,57 ****
          String pid = null;
          Template outty = null;
-         String msg = null;
          Exception pageException = null;
          try
--- 53,56 ----

Index: SearchServlet.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/velocity/SearchServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SearchServlet.java  13 Aug 2003 02:13:50 -0000      1.2
--- SearchServlet.java  3 Sep 2003 21:21:15 -0000       1.3
***************
*** 3,22 ****
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
- 
  import org.apache.lucene.document.Document;
  import org.apache.lucene.search.Hits;
- 
  import org.apache.velocity.Template;
  import org.apache.velocity.context.Context;
- 
  import org.roller.RollerException;
- 
- import org.roller.model.UserManager;
  import org.roller.model.WeblogManager;
- 
- import org.roller.pojos.PageData;
  import org.roller.pojos.WeblogEntryData;
- import org.roller.pojos.WebsiteData;
- 
  import org.roller.presentation.RollerContext;
  import org.roller.presentation.RollerRequest;
--- 3,13 ----
***************
*** 28,32 ****
  import java.util.ArrayList;
  import java.util.Date;
- import java.util.List;
  import java.util.TreeMap;
  
--- 19,22 ----
***************
*** 56,60 ****
                                    HttpServletResponse response, Context ctx)
      {
-         Template outty = null;
          Exception pageException = null;
  
--- 46,49 ----




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