roller/src/org/roller/presentation/weblog/tags BigWeblogCalendarModel.java,1.13,1.14 EditWeblogCategoriesTag.java,1.9,1.10 EditWeblogEntriesTag.java,1.25,1.26 ViewWeblogEntriesTag.java,1.16,1.17

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

Modified Files:
        BigWeblogCalendarModel.java EditWeblogCategoriesTag.java 
        EditWeblogEntriesTag.java ViewWeblogEntriesTag.java 
Log Message:
Cleanups as recommended by Eclipse and PMD.

Index: BigWeblogCalendarModel.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/tags/BigWeblogCalendarModel.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** BigWeblogCalendarModel.java 24 Aug 2003 04:45:26 -0000      1.13
--- BigWeblogCalendarModel.java 3 Sep 2003 21:21:55 -0000       1.14
***************
*** 8,12 ****
  import java.text.ParsePosition;
  import java.text.SimpleDateFormat;
- import java.util.ArrayList;
  import java.util.Calendar;
  import java.util.Date;
--- 8,11 ----

Index: EditWeblogCategoriesTag.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/tags/EditWeblogCategoriesTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** EditWeblogCategoriesTag.java        16 Aug 2003 00:07:44 -0000      1.9
--- EditWeblogCategoriesTag.java        3 Sep 2003 21:21:55 -0000       1.10
***************
*** 36,41 ****
                try
                {
-                       HttpServletRequest req = 
-                               (HttpServletRequest)pageContext.getRequest();
                        RollerRequest rreq = RollerRequest.getRollerRequest(
                  (HttpServletRequest)pageContext.getRequest());
--- 36,39 ----

Index: EditWeblogEntriesTag.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/tags/EditWeblogEntriesTag.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** EditWeblogEntriesTag.java   15 Aug 2003 23:26:01 -0000      1.25
--- EditWeblogEntriesTag.java   3 Sep 2003 21:21:55 -0000       1.26
***************
*** 5,10 ****
  import org.apache.commons.logging.LogFactory;
  import org.apache.struts.util.RequestUtils;
- import org.apache.velocity.VelocityContext;
- import org.apache.velocity.app.Velocity;
  import org.roller.RollerException;
  import org.roller.model.WeblogManager;
--- 5,8 ----
***************
*** 13,19 ****
  import org.roller.pojos.WeblogEntryData;
  import org.roller.presentation.RollerRequest;
- import org.roller.presentation.velocity.ContextLoader;
  
- import java.io.StringWriter;
  import java.text.SimpleDateFormat;
  import java.util.ArrayList;
--- 11,15 ----
***************
*** 24,29 ****
  import java.util.Map;
  
- import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
  import javax.servlet.jsp.JspException;
  import javax.servlet.jsp.JspWriter;
--- 20,23 ----
***************
*** 49,55 ****
          try
          {
-             HttpServletRequest req =
-                 (HttpServletRequest)pageContext.getRequest();
- 
              RollerRequest rreq = RollerRequest.getRollerRequest(pageContext);
              WeblogManager weblogMgr =
--- 43,46 ----
***************
*** 174,178 ****
       * displayed.
       * 
!      * @deprecated This is dangerous, misguided, and no longer used.
       * 
       * @param entry
--- 165,170 ----
       * displayed.
       * 
!      * @deprecated This is dangerous, misguided, and no longer used.  As such,
!      * no longer does as advertised.
       * 
       * @param entry
***************
*** 184,214 ****
      throws RollerException
      {        
-         VelocityContext context = new VelocityContext();
-         ContextLoader.setupContext( context, rreq, 
-             (HttpServletResponse)pageContext.getResponse() );
- 
-         context.put("entry", entry);
-         
          StringBuffer buf = new StringBuffer("<p>");
! 
!         /* lets get the strings to render */
!         StringWriter sw = new StringWriter();
!         try
!         {
!             if (StringUtils.isNotEmpty(entry.getTitle()))
!             {
!                 Velocity.evaluate( context, sw, "entryTitle", 
entry.getTitle() );
!                 buf.append("<b>").append(sw.toString()).append(" </b>");
!                 sw.flush();
!             }
!             sw = new StringWriter();
!             Velocity.evaluate( context, sw, "entryBody", entry.getText() );
!             buf.append(sw.toString());
!             sw.flush();
!         }
!         catch (Exception e)
          {
!             mLogger.warn("EditWeblogEntriesTag.evaluateEntryBody", e);
          }
          buf.append("</p>");
          return buf.toString();
--- 176,187 ----
      throws RollerException
      {        
          StringBuffer buf = new StringBuffer("<p>");
!         if (StringUtils.isNotEmpty(entry.getTitle()))
          {
!             buf.append("<b>").append(entry.getTitle()).append(" </b>");
          }
+         buf.append(entry.getText());
+ 
+ 
          buf.append("</p>");
          return buf.toString();

Index: ViewWeblogEntriesTag.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/weblog/tags/ViewWeblogEntriesTag.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ViewWeblogEntriesTag.java   12 Aug 2003 05:12:05 -0000      1.16
--- ViewWeblogEntriesTag.java   3 Sep 2003 21:21:55 -0000       1.17
***************
*** 6,10 ****
  import org.apache.velocity.VelocityContext;
  import org.apache.velocity.runtime.RuntimeSingleton;
- import org.roller.model.UserManager;
  import org.roller.model.WeblogManager;
  import org.roller.pojos.PageData;
--- 6,9 ----
***************
*** 19,23 ****
  
  import javax.servlet.http.HttpServletRequest;
- import javax.servlet.http.HttpServletResponse;
  import javax.servlet.jsp.JspException;
  import javax.servlet.jsp.tagext.Tag;
--- 18,21 ----
***************
*** 75,80 ****
                        HttpServletRequest req = 
                                (HttpServletRequest)pageContext.getRequest();
-                       HttpServletResponse res = 
-                               (HttpServletResponse)pageContext.getResponse();
  
                        RollerRequest rreq = 
RollerRequest.getRollerRequest(req);
--- 73,76 ----




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