roller/src/org/roller/business BookmarkManagerBase.java,1.5,1.6 NewsfeedManagerBase.java,1.2,1.3 RefererManagerBase.java,1.17,1.18 UserManagerBase.java,1.5,1.6 WeblogManagerBase.java,1.15,1.16

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

Modified Files:
        BookmarkManagerBase.java NewsfeedManagerBase.java 
        RefererManagerBase.java UserManagerBase.java 
        WeblogManagerBase.java 
Log Message:
Cleanups as recommended by Eclipse and PMD.

Index: BookmarkManagerBase.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/BookmarkManagerBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BookmarkManagerBase.java    20 Aug 2003 16:37:30 -0000      1.5
--- BookmarkManagerBase.java    3 Sep 2003 21:21:13 -0000       1.6
***************
*** 1,10 ****
  package org.roller.business;
  
- import java.io.StringReader;
- import java.util.Enumeration;
- import java.util.Iterator;
- import java.util.List;
- import java.util.Vector;
- 
  import net.sf.hibernate.Hibernate;
  import net.sf.hibernate.type.Type;
--- 1,4 ----
***************
*** 23,26 ****
--- 17,26 ----
  import org.roller.pojos.WebsiteData;
  
+ import java.io.StringReader;
+ import java.util.Enumeration;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Vector;
+ 
  
  /**
***************
*** 49,54 ****
          if (  folder != null ) 
          {
-             BookmarkData[] bookmarks = null;
- 
              // Query for bookmarks in folder
              Object[] args = { folder.getId() }; 
--- 49,52 ----

Index: NewsfeedManagerBase.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/NewsfeedManagerBase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NewsfeedManagerBase.java    20 Aug 2003 16:37:30 -0000      1.2
--- NewsfeedManagerBase.java    3 Sep 2003 21:21:13 -0000       1.3
***************
*** 4,9 ****
  package org.roller.business;
  
- import java.util.List;
- 
  import net.sf.hibernate.Hibernate;
  import net.sf.hibernate.type.Type;
--- 4,7 ----
***************
*** 13,16 ****
--- 11,16 ----
  import org.roller.model.PersistenceStrategy;
  import org.roller.pojos.NewsfeedData;
+ 
+ import java.util.List;
  
  /**

Index: RefererManagerBase.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/RefererManagerBase.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** RefererManagerBase.java     20 Aug 2003 16:37:30 -0000      1.17
--- RefererManagerBase.java     3 Sep 2003 21:21:13 -0000       1.18
***************
*** 8,13 ****
  import org.roller.RollerException;
  import org.roller.ThreadManager;
- import org.roller.model.PersistenceStrategy;
  import org.roller.model.ParsedRequest;
  import org.roller.model.RefererManager;
  import org.roller.pojos.RefererData;
--- 8,13 ----
  import org.roller.RollerException;
  import org.roller.ThreadManager;
  import org.roller.model.ParsedRequest;
+ import org.roller.model.PersistenceStrategy;
  import org.roller.model.RefererManager;
  import org.roller.pojos.RefererData;
***************
*** 360,365 ****
                          secondTryUrl = "http://www"+refererUrl.substring(7);  
         
                      }
                      Object[] args2 = { website.getId(), requestUrl, 
secondTryUrl };
!                     matchRef = getMatchingReferers(args);
                      if ( matchRef.size() == 1 )
                      {
--- 360,366 ----
                          secondTryUrl = "http://www"+refererUrl.substring(7);  
         
                      }
+                     
                      Object[] args2 = { website.getId(), requestUrl, 
secondTryUrl };
!                     matchRef = getMatchingReferers(args2);
                      if ( matchRef.size() == 1 )
                      {
***************
*** 387,390 ****
--- 388,392 ----
              { 
                  // Referer was not found in database, so new Referer object
+                 Integer one = new Integer(1);
                  RefererData ref =
                      new RefererData( 
***************
*** 398,405 ****
                          null,
                          null,
!                         new Boolean(false),
!                         new Boolean(false),
!                         new Integer(1),
!                         new Integer(1));
                          
                   mLogger.debug("newReferer="+ref.getRefererUrl());
--- 400,407 ----
                          null,
                          null,
!                         Boolean.FALSE,
!                         Boolean.FALSE,
!                         one,
!                         one);
                          
                   mLogger.debug("newReferer="+ref.getRefererUrl());
***************
*** 496,500 ****
                          if ( matchRef.size() == 0 )
                          {                                                   
!                             mReferer.setVisible(new Boolean(true));
                          }
                          else
--- 498,502 ----
                          if ( matchRef.size() == 0 )
                          {                                                   
!                             mReferer.setVisible(Boolean.TRUE);
                          }
                          else
***************
*** 504,508 ****
                              // in from one of them, but we can mark them 
                              // as duplicates.
!                             mReferer.setDuplicate(new Boolean(true));
                          }
                      
--- 506,510 ----
                              // in from one of them, but we can mark them 
                              // as duplicates.
!                             mReferer.setDuplicate(Boolean.TRUE);
                          }
                      
***************
*** 525,529 ****
  
                          // LOOP: find the referer with the highest weight
!                         boolean visible = false;
                          Object[] args = { 
                             mReferer.getWebsite().getId(), 
--- 527,531 ----
  
                          // LOOP: find the referer with the highest weight
!                         Boolean visible = Boolean.FALSE;
                          Object[] args = { 
                             mReferer.getWebsite().getId(), 
***************
*** 533,560 ****
                          RefererData chosen = null;
                          int maxweight = 0;
!                         for (Iterator rdItr = 
refs.iterator();rdItr.hasNext();) {
                              RefererData referer = (RefererData) rdItr.next();
                              
                              int weight = referer.getRefererUrl().length();
                              if (referer.getRefererUrl().indexOf('#') != -1)
!                                     {
!                                         weight += 100;
!                                     }
   
!                                     if ( weight > maxweight )
!                                     {
!                                         chosen = referer;
!                                         maxweight = weight;
!                                     }  
      
!                                     if (referer.getVisible().booleanValue())
!                                     {
!                                         // If any are visible then chosen 
                                  // replacement must be visible as well.
!                                 visible = true;   
                              } 
                                                              
!                         }
!                         
                      
                          // LOOP: to mark all of the lower weight ones 
--- 535,562 ----
                          RefererData chosen = null;
                          int maxweight = 0;
!                         for (Iterator rdItr = 
refs.iterator();rdItr.hasNext();) 
!                         {
                              RefererData referer = (RefererData) rdItr.next();
                              
                              int weight = referer.getRefererUrl().length();
                              if (referer.getRefererUrl().indexOf('#') != -1)
!                             {
!                                 weight += 100;
!                             }
   
!                             if ( weight > maxweight )
!                             {
!                                 chosen = referer;
!                                 maxweight = weight;
!                             }  
      
!                             if (referer.getVisible().booleanValue())
!                             {
!                                 // If any are visible then chosen 
                                  // replacement must be visible as well.
!                                 visible = Boolean.TRUE;   
                              } 
                                                              
!                         }                        
                      
                          // LOOP: to mark all of the lower weight ones 
***************
*** 565,574 ****
                              if (referer != chosen)
                              {
!                                 referer.setDuplicate(new Boolean(true));
                              }
                              else 
                              {
!                                 referer.setDuplicate(new Boolean(false));   
!                                 referer.setVisible(new Boolean(visible));
                              }
                              storeReferer(referer);
--- 567,576 ----
                              if (referer != chosen)
                              {
!                                 referer.setDuplicate(Boolean.TRUE);
                              }
                              else 
                              {
!                                 referer.setDuplicate(Boolean.FALSE);   
!                                 referer.setVisible(visible);
                              }
                              storeReferer(referer);

Index: UserManagerBase.java
===================================================================
RCS file: /cvsroot/roller/roller/src/org/roller/business/UserManagerBase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** UserManagerBase.java        31 Aug 2003 00:38:12 -0000      1.5
--- UserManagerBase.java        3 Sep 2003 21:21:13 -0000       1.6
***************
*** 4,13 ****
  package org.roller.business;
  
- import java.sql.Timestamp;
- import java.util.Date;
- import java.util.HashMap;
- import java.util.Iterator;
- import java.util.List;
- 
  import net.sf.hibernate.Hibernate;
  import net.sf.hibernate.type.Type;
--- 4,7 ----
***************
*** 34,37 ****
--- 28,37 ----
  import org.roller.util.Utilities;
  
+ import java.sql.Timestamp;
+ import java.util.Date;
+ import java.util.HashMap;
+ import java.util.Iterator;
+ import java.util.List;
+ 
  /**
   * @author llavandowska
***************
*** 254,259 ****
      public PageData getPageByName(String u, String p) throws RollerException
      {
-         String msg = "getPageByName";
-         
          if ( u==null )
              throw new RollerException("Username is null");
--- 254,257 ----
***************
*** 278,292 ****
       * @see org.roller.model.UserManager#getPageByLink(java.lang.String, 
java.lang.String)
       */
!     public PageData getPageByLink(String u, String p) throws RollerException
!     {
!         String msg = "getPageByLink";
!         
!         if ( u==null )
              throw new RollerException("Username is null");
                                     
!         if ( p==null )
              throw new RollerException("Pagelink is null");
                                     
!         Object[] args = { u,p, Boolean.TRUE};
          Type[] types = { Hibernate.STRING,Hibernate.STRING,Hibernate.BOOLEAN 
};
          
--- 276,288 ----
       * @see org.roller.model.UserManager#getPageByLink(java.lang.String, 
java.lang.String)
       */
!     public PageData getPageByLink(String user, String pageLink) throws 
RollerException
!     {        
!         if ( user==null )
              throw new RollerException("Username is null");
                                     
!         if ( pageLink==null )
              throw new RollerException("Pagelink is null");
                                     
!         Object[] args = { user, pageLink, Boolean.TRUE};
          Type[] types = { Hibernate.STRING,Hibernate.STRING,Hibernate.BOOLEAN 
};
          
***************
*** 308,313 ****
          if ( userName == null )
              throw new RollerException("Username is null");
!             
!         String msg = "getPages";                                   
          Object[] args = {userName, Boolean.TRUE};
          Type[] types = {Hibernate.STRING,Hibernate.BOOLEAN};       
--- 304,308 ----
          if ( userName == null )
              throw new RollerException("Username is null");
!                                            
          Object[] args = {userName, Boolean.TRUE};
          Type[] types = {Hibernate.STRING,Hibernate.BOOLEAN};       
***************
*** 323,327 ****
      public String fixPageLink(PageData data) throws RollerException
      {
-         String msg = "";
          String link = Utilities.removeHTML(data.getName());
          link = Utilities.removeNonAlphanumeric(link);
--- 318,321 ----
***************
*** 492,496 ****
                  ts,                // pubTime
                  ts,                // updateTime
!                 new Boolean(true) // publishEntry
              );           
              mSupport.storePersistentObject(post);
--- 486,490 ----
                  ts,                // pubTime
                  ts,                // updateTime
!                 Boolean.TRUE // publishEntry
              );           
              mSupport.storePersistentObject(post);

Index: WeblogManagerBase.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/WeblogManagerBase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** WeblogManagerBase.java      24 Aug 2003 04:46:23 -0000      1.15
--- WeblogManagerBase.java      3 Sep 2003 21:21:13 -0000       1.16
***************
*** 4,20 ****
  package org.roller.business;
  
- import java.text.ParsePosition;
- import java.text.SimpleDateFormat;
- import java.util.ArrayList;
- import java.util.Calendar;
- import java.util.Collections;
- import java.util.Comparator;
- import java.util.Date;
- import java.util.Iterator;
- import java.util.List;
- import java.util.Map;
- import java.util.StringTokenizer;
- import java.util.TreeMap;
- 
  import net.sf.hibernate.Hibernate;
  import net.sf.hibernate.type.Type;
--- 4,7 ----
***************
*** 31,34 ****
--- 18,34 ----
  import org.roller.util.Utilities;
  
+ import java.text.ParsePosition;
+ import java.text.SimpleDateFormat;
+ import java.util.ArrayList;
+ import java.util.Calendar;
+ import java.util.Collections;
+ import java.util.Comparator;
+ import java.util.Date;
+ import java.util.Iterator;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.StringTokenizer;
+ import java.util.TreeMap;
+ 
  /**
   * Provides methods that can be used by persistence framework specific 
***************
*** 606,612 ****
          String query =
              Queries.RECENT_PUBLISHED_ENTRIES
!                 + Queries.WEBSITE_USER_ENABLED_RESTRICTION3
!                 + Queries.ORDER_BY_PUBTIME
!                 + " LIMIT $4";
  
          return mSupport.query(query, args, types);
--- 606,612 ----
          String query =
              Queries.RECENT_PUBLISHED_ENTRIES
!             + Queries.WEBSITE_USER_ENABLED_RESTRICTION3 
!             + Queries.ORDER_BY_PUBTIME;
!         if (max > 0) query += " LIMIT $4";
  
          return mSupport.query(query, args, types);




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