roller/src/org/roller/business/castor BookmarkManagerImpl.java,1.31,1.32 CastorStrategy.java,1.1,1.2 Export.java,1.17,1.18 Import.java,1.28,1.29 NewsfeedManagerImpl.java,1.15,1.16 RefererManagerImpl.java,1.41,1.42 RollerImpl.java,1.13,1.14 UserManagerImpl.java,1.29,1.30 WeblogManagerImpl.java,1.53,1.54

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

Modified Files:
        BookmarkManagerImpl.java CastorStrategy.java Export.java 
        Import.java NewsfeedManagerImpl.java RefererManagerImpl.java 
        RollerImpl.java UserManagerImpl.java WeblogManagerImpl.java 
Log Message:
Cleanups as recommended by Eclipse and PMD.

Index: BookmarkManagerImpl.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/castor/BookmarkManagerImpl.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** BookmarkManagerImpl.java    20 Aug 2003 16:37:30 -0000      1.31
--- BookmarkManagerImpl.java    3 Sep 2003 21:21:13 -0000       1.32
***************
*** 2,9 ****
  package org.roller.business.castor;
  
- import java.io.Serializable;
- 
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
  import org.roller.RollerException;
  import org.roller.business.BookmarkManagerBase;
--- 2,5 ----
***************
*** 16,19 ****
--- 12,17 ----
  import org.roller.pojos.WebsiteData;
  
+ import java.io.Serializable;
+ 
  
  /**
***************
*** 28,35 ****
  public class BookmarkManagerImpl extends BookmarkManagerBase
      implements BookmarkManager, Serializable
! {
!     private static Log mLogger = 
!         LogFactory.getFactory().getInstance(BookmarkManagerImpl.class);
!     
      //---------------------------------------------------- Startup and 
Shutdown
  
--- 26,30 ----
  public class BookmarkManagerImpl extends BookmarkManagerBase
      implements BookmarkManager, Serializable
! {    
      //---------------------------------------------------- Startup and 
Shutdown
  
***************
*** 47,59 ****
          {            
              data.setFolder( (FolderData)
!                 mSupport.storePersistentObject( data.getFolder()) );
                      
              data.getFolder().setWebsite( (WebsiteData)
!                 mSupport.storePersistentObject(
!                    data.getFolder().getWebsite()) );
                  
              data.getFolder().getWebsite().setUser((UserData)
!                 mSupport.storePersistentObject(
!                     data.getFolder().getWebsite().getUser()) );
                  
              mSupport.storePersistentObject(  data );
--- 42,55 ----
          {            
              data.setFolder( (FolderData)
!                 mSupport.retrievePersistentObject( 
!                     data.getFolder().getId(), FolderData.class) );
                      
              data.getFolder().setWebsite( (WebsiteData)
!                 mSupport.retrievePersistentObject(
!                    data.getFolder().getWebsite().getId(), WebsiteData.class) 
);
                  
              data.getFolder().getWebsite().setUser((UserData)
!                 mSupport.retrievePersistentObject(
!                     data.getFolder().getWebsite().getUser().getId(), 
UserData.class) );
                  
              mSupport.storePersistentObject(  data );
***************
*** 73,77 ****
              
          data.getWebsite().setUser((UserData)
!             mSupport.storePersistentObject(data.getWebsite().getUser()) );
                  
          mSupport.storePersistentObject(  data );
--- 69,74 ----
              
          data.getWebsite().setUser((UserData)
!             mSupport.retrievePersistentObject(
!                 data.getWebsite().getUser().getId(), UserData.class) );
                  
          mSupport.storePersistentObject(  data );

Index: CastorStrategy.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/castor/CastorStrategy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CastorStrategy.java 14 Aug 2003 21:09:49 -0000      1.1
--- CastorStrategy.java 3 Sep 2003 21:21:13 -0000       1.2
***************
*** 1,8 ****
  package org.roller.business.castor;
  
- import java.io.Serializable;
- import java.util.ArrayList;
- import java.util.List;
- 
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
--- 1,4 ----
***************
*** 19,22 ****
--- 15,22 ----
  import org.roller.model.PersistenceStrategy;
  import org.roller.pojos.PersistentObject;
+ 
+ import java.io.Serializable;
+ import java.util.ArrayList;
+ import java.util.List;
  
  

Index: Export.java
===================================================================
RCS file: /cvsroot/roller/roller/src/org/roller/business/castor/Export.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Export.java 30 Jul 2003 02:49:26 -0000      1.17
--- Export.java 3 Sep 2003 21:21:13 -0000       1.18
***************
*** 2,8 ****
  package org.roller.business.castor;
  
- import java.io.PrintWriter;
- import java.io.StringWriter;
- 
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
--- 2,5 ----
***************
*** 14,17 ****
--- 11,17 ----
  import org.roller.model.UserManager;
  import org.roller.pojos.UserData;
+ 
+ import java.io.PrintWriter;
+ import java.io.StringWriter;
  
  /**

Index: Import.java
===================================================================
RCS file: /cvsroot/roller/roller/src/org/roller/business/castor/Import.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** Import.java 30 Jul 2003 02:49:26 -0000      1.28
--- Import.java 3 Sep 2003 21:21:13 -0000       1.29
***************
*** 2,14 ****
  package org.roller.business.castor;
  
- import java.io.BufferedReader;
- import java.io.File;
- import java.io.FileReader;
- import java.io.FilenameFilter;
- import java.sql.Timestamp;
- import java.text.SimpleDateFormat;
- import java.util.Date;
- import java.util.Vector;
- 
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
--- 2,5 ----
***************
*** 27,30 ****
--- 18,30 ----
  import org.roller.pojos.WebsiteData;
  
+ import java.io.BufferedReader;
+ import java.io.File;
+ import java.io.FileReader;
+ import java.io.FilenameFilter;
+ import java.sql.Timestamp;
+ import java.text.SimpleDateFormat;
+ import java.util.Date;
+ import java.util.Vector;
+ 
  
  //////////////////////////////////////////////////////////////////////////////
***************
*** 88,92 ****
          this();
          String fileName = null;
!         String type = null;
          String user = null;
          String cat  = null;
--- 88,92 ----
          this();
          String fileName = null;
!         //String type = null;
          String user = null;
          String cat  = null;
***************
*** 96,100 ****
          if (args.length == 4 && args[0].equals("radio"))
          {
!             type = args[0];
              user = args[1];
              cat  = args[2];
--- 96,100 ----
          if (args.length == 4 && args[0].equals("radio"))
          {
!             //type = args[0];
              user = args[1];
              cat  = args[2];

Index: NewsfeedManagerImpl.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/castor/NewsfeedManagerImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** NewsfeedManagerImpl.java    20 Aug 2003 16:37:30 -0000      1.15
--- NewsfeedManagerImpl.java    3 Sep 2003 21:21:13 -0000       1.16
***************
*** 2,9 ****
  package org.roller.business.castor;
  
- import java.io.Serializable;
- 
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
  import org.roller.RollerException;
  import org.roller.business.NewsfeedManagerBase;
--- 2,5 ----
***************
*** 15,18 ****
--- 11,16 ----
  import org.roller.pojos.WebsiteData;
  
+ import java.io.Serializable;
+ 
  
  /**
***************
*** 23,28 ****
      implements NewsfeedManager, Serializable
  {
-     private static Log mLogger = 
-         LogFactory.getFactory().getInstance(NewsfeedManagerImpl.class);
  
      private UserManager mUserMgr = null;
--- 21,24 ----

Index: RefererManagerImpl.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/castor/RefererManagerImpl.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** RefererManagerImpl.java     20 Aug 2003 16:37:30 -0000      1.41
--- RefererManagerImpl.java     3 Sep 2003 21:21:13 -0000       1.42
***************
*** 1,11 ****
  package org.roller.business.castor;
  
- import java.io.Serializable;
- import java.text.SimpleDateFormat;
- import java.util.ArrayList;
- import java.util.Date;
- import java.util.Iterator;
- import java.util.List;
- 
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
--- 1,4 ----
***************
*** 23,26 ****
--- 16,26 ----
  import org.roller.pojos.UserData;
  import org.roller.pojos.WebsiteData;
+ 
+ import java.io.Serializable;
+ import java.text.SimpleDateFormat;
+ import java.util.ArrayList;
+ import java.util.Date;
+ import java.util.Iterator;
+ import java.util.List;
  
  /////////////////////////////////////////////////////////////////////////////

Index: RollerImpl.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/castor/RollerImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** RollerImpl.java     14 Aug 2003 21:09:49 -0000      1.13
--- RollerImpl.java     3 Sep 2003 21:21:13 -0000       1.14
***************
*** 1,8 ****
  package org.roller.business.castor;
  
- import java.io.Serializable;
- 
- import javax.servlet.ServletContext;
- 
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
--- 1,4 ----
***************
*** 18,22 ****
  import org.roller.model.WeblogManager;
  import org.roller.pojos.PersistentObject;
! import org.roller.pojos.UserData;
  
  /** 
--- 14,21 ----
  import org.roller.model.WeblogManager;
  import org.roller.pojos.PersistentObject;
! 
! import java.io.Serializable;
! 
! import javax.servlet.ServletContext;
  
  /** 
***************
*** 29,35 ****
        
        protected static transient JDO mJDO = null;
- 
-     private String mUserName = null;
-     private UserData mUser = null;
  
      private CastorStrategy mSupport = null;
--- 28,31 ----

Index: UserManagerImpl.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/castor/UserManagerImpl.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** UserManagerImpl.java        20 Aug 2003 16:37:30 -0000      1.29
--- UserManagerImpl.java        3 Sep 2003 21:21:13 -0000       1.30
***************
*** 1,7 ****
  package org.roller.business.castor;
  
- import java.io.Serializable;
- import java.util.ResourceBundle;
- 
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
--- 1,4 ----
***************
*** 15,18 ****
--- 12,17 ----
  import org.roller.pojos.WebsiteData;
  
+ import java.io.Serializable;
+ 
  
  /////////////////////////////////////////////////////////////////////////////
***************
*** 25,30 ****
      private static Log mLogger =
          LogFactory.getFactory().getInstance(UserManagerImpl.class);
- 
-     private ResourceBundle mBundle = null;
  
      //---------------------------------------------------- Startup and 
Shutdown
--- 24,27 ----

Index: WeblogManagerImpl.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/castor/WeblogManagerImpl.java,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** WeblogManagerImpl.java      20 Aug 2003 16:37:30 -0000      1.53
--- WeblogManagerImpl.java      3 Sep 2003 21:21:13 -0000       1.54
***************
*** 1,11 ****
  package org.roller.business.castor;
  
- import java.io.Serializable;
- import java.util.ArrayList;
- import java.util.Date;
- import java.util.List;
- 
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
  import org.roller.RollerException;
  import org.roller.business.Queries;
--- 1,4 ----
***************
*** 20,23 ****
--- 13,21 ----
  import org.roller.util.DateUtil;
  
+ import java.io.Serializable;
+ import java.util.ArrayList;
+ import java.util.Date;
+ import java.util.List;
+ 
  
  
///////////////////////////////////////////////////////////////////////////////
***************
*** 28,34 ****
      implements WeblogManager, Serializable
  {
-     private static Log mLogger =
-         LogFactory.getFactory().getInstance(WeblogManagerImpl.class);
- 
      private UserManager mUserMgr = null;
  
--- 26,29 ----




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