roller/src/org/roller/presentation/website/actions PageFormAction.java,1.5,1.6 UploadFileFormAction.java,1.3,1.4 UserFormAction.java,1.6,1.7 WebsiteFormAction.java,1.7,1.8

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

Modified Files:
        PageFormAction.java UploadFileFormAction.java 
        UserFormAction.java WebsiteFormAction.java 
Log Message:
Cleanups as recommended by Eclipse and PMD.

Index: PageFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/website/actions/PageFormAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PageFormAction.java 31 Aug 2003 00:38:12 -0000      1.5
--- PageFormAction.java 3 Sep 2003 21:21:55 -0000       1.6
***************
*** 158,162 ****
      {
          ActionForward forward = mapping.findForward("editPages");
-         PageForm form = null;
          try
          {
--- 158,161 ----

Index: UploadFileFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/website/actions/UploadFileFormAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** UploadFileFormAction.java   25 May 2003 13:11:12 -0000      1.3
--- UploadFileFormAction.java   3 Sep 2003 21:21:56 -0000       1.4
***************
*** 18,22 ****
  import org.roller.presentation.website.formbeans.UploadFileForm;
  
- import java.io.ByteArrayOutputStream;
  import java.io.File;
  import java.io.FileOutputStream;
--- 18,21 ----
***************
*** 86,90 ****
              catch (Exception e)
              {
!                 System.err.println("Unable to find user.");
                  return fwd;
              }
--- 85,89 ----
              catch (Exception e)
              {
!                 mLogger.warn("Unable to find user.");
                  return fwd;
              }
***************
*** 139,142 ****
--- 138,145 ----
                      String fileName= files[i].getFileName();
  
+                     //retrieve the content type
+                     // this would be useful if it could be trusted
+                     //String contentType = files[i].getContentType();
+ 
                      // is the extension of this file okay?
                      boolean allowFile = true;
***************
*** 174,187 ****
                      }
  
-                     //retrieve the content type
-                     String contentType = files[i].getContentType();
- 
-                     //retrieve the file size
-                     String size = (files[i].getFileSize() + " bytes");
- 
-                     String data = null;
- 
                      //retrieve the file data
-                     ByteArrayOutputStream baos = new ByteArrayOutputStream();
                      InputStream stream = files[i].getInputStream();
  
--- 177,181 ----
***************
*** 217,222 ****
                          }
                          bos.close();
!                         data = "The file has been written to \""
!                             + dir + username + "\"";
                          // increase userDirSize by current file's size
                          userDirSize = userDirSize + fileSize;
--- 211,216 ----
                          }
                          bos.close();
!                         mLogger.debug("The file has been written to \""
!                             + dir + username + "\"");
                          // increase userDirSize by current file's size
                          userDirSize = userDirSize + fileSize;
***************
*** 284,293 ****
  
              File deleteMe = null;
-             boolean deleteSuccess = false;
              String[] deleteFiles = theForm.getDeleteFiles();
              for (int i=0; i<deleteFiles.length; i++)
              {
                  deleteMe = new File(dirPath, deleteFiles[i]);
!                 deleteSuccess = deleteMe.delete();
                  deleteMe = null;
              }
--- 278,286 ----
  
              File deleteMe = null;
              String[] deleteFiles = theForm.getDeleteFiles();
              for (int i=0; i<deleteFiles.length; i++)
              {
                  deleteMe = new File(dirPath, deleteFiles[i]);
!                 deleteMe.delete();
                  deleteMe = null;
              }

Index: UserFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/website/actions/UserFormAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** UserFormAction.java 3 Jul 2003 19:19:50 -0000       1.6
--- UserFormAction.java 3 Sep 2003 21:21:56 -0000       1.7
***************
*** 50,54 ****
          throws IOException, ServletException
      {
-         String msg = "adding user";
          ActionForward forward = mapping.findForward("welcome.page");
          ActionErrors errors = new ActionErrors();
--- 50,53 ----

Index: WebsiteFormAction.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/presentation/website/actions/WebsiteFormAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** WebsiteFormAction.java      16 Aug 2003 00:07:46 -0000      1.7
--- WebsiteFormAction.java      3 Sep 2003 21:21:56 -0000       1.8
***************
*** 13,17 ****
  import org.roller.pojos.RollerConfig;
  import org.roller.pojos.UserData;
- import org.roller.pojos.WeblogCategoryData;
  import org.roller.pojos.WebsiteData;
  import org.roller.presentation.RollerContext;
--- 13,16 ----




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