[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/pageUtil WLSetupDisplayWaitingListAction.java, 1.8, 1.8.12.1

[Derek A. <mu...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/pageUtil
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27146/web/WEB-INF/classes/src/oscar/oscarWaitingList/pageUtil

Modified Files:
      Tag: CAISI_3_3_0_20081103_B
	WLSetupDisplayWaitingListAction.java 
Log Message:
2264852		

* Reordered null checks on line 171 to come BEFORE empty String checks
* Added Log4J Logger, removed System.out.println() from BeanHandler

Index: WLSetupDisplayWaitingListAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/pageUtil/WLSetupDisplayWaitingListAction.java,v
retrieving revision 1.8
retrieving revision 1.8.12.1
diff -C2 -d -r1.8 -r1.8.12.1
*** WLSetupDisplayWaitingListAction.java	18 Mar 2008 19:41:33 -0000	1.8
--- WLSetupDisplayWaitingListAction.java	12 Nov 2008 16:26:35 -0000	1.8.12.1
***************
*** 33,36 ****
--- 33,37 ----
  import javax.servlet.http.HttpSession;
  
+ import org.apache.log4j.Logger;
  import org.apache.struts.action.Action;
  import org.apache.struts.action.ActionForm;
***************
*** 49,52 ****
--- 50,54 ----
  public final class WLSetupDisplayWaitingListAction extends Action {
  
+ 	private Logger log = Logger.getLogger(WLSetupDisplayWaitingListAction.class);
      public ActionForward execute(ActionMapping mapping,
                                   ActionForm form,
***************
*** 56,60 ****
          
      	
!         System.out.println("\n\nWLSetupDisplayWaitingListAction/execute(): just entering.");
          
          String update = request.getParameter("update");
--- 58,62 ----
          
      	
!         log.debug("\n\nWLSetupDisplayWaitingListAction/execute(): just entering.");
          
          String update = request.getParameter("update");
***************
*** 68,76 ****
          String providerNo = "";
          
!         System.out.println("\n\nWLSetupDisplayWaitingListAction/execute(): update = " + update);
!         System.out.println("\n\nWLSetupDisplayWaitingListAction/execute(): remove = " + remove);
  
      	LazyValidatorForm wlForm = (LazyValidatorForm)form;
!         System.out.println("WLSetupDisplayWaitingListAction/execute(): after  (LazyValidatorForm)form ");
  
          
--- 70,78 ----
          String providerNo = "";
          
!         log.debug("\n\nWLSetupDisplayWaitingListAction/execute(): update = " + update);
!         log.debug("\n\nWLSetupDisplayWaitingListAction/execute(): remove = " + remove);
  
      	LazyValidatorForm wlForm = (LazyValidatorForm)form;
!         log.debug("WLSetupDisplayWaitingListAction/execute(): after  (LazyValidatorForm)form ");
  
          
***************
*** 79,85 ****
          String onListSinceSelected =  request.getParameter("onListSinceSelected");
  
!         System.out.println("WLSetupDisplayWaitingListAction/execute(): demographicNumSelected = "+ demographicNumSelected);
!         System.out.println("WLSetupDisplayWaitingListAction/execute(): wlNoteSelected = "+ wlNoteSelected);
!         System.out.println("WLSetupDisplayWaitingListAction/execute(): onListSinceSelected = "+ onListSinceSelected);
          
          
--- 81,87 ----
          String onListSinceSelected =  request.getParameter("onListSinceSelected");
  
!         log.debug("WLSetupDisplayWaitingListAction/execute(): demographicNumSelected = "+ demographicNumSelected);
!         log.debug("WLSetupDisplayWaitingListAction/execute(): wlNoteSelected = "+ wlNoteSelected);
!         log.debug("WLSetupDisplayWaitingListAction/execute(): onListSinceSelected = "+ onListSinceSelected);
          
          
***************
*** 88,92 ****
          }
          
!         System.out.println("WLSetupDisplayWaitingListAction/execute(): waitingListId = "+ waitingListId);
          if( update != null  &&  update.equalsIgnoreCase("Y") ){
  	        
--- 90,94 ----
          }
          
!         log.debug("WLSetupDisplayWaitingListAction/execute(): waitingListId = "+ waitingListId);
          if( update != null  &&  update.equalsIgnoreCase("Y") ){
  	        
***************
*** 114,118 ****
  	
  		        }catch(Exception ex){
! 		            System.out.println("WLUpdateDisplayWaitingListAction/execute(): Exception: "+ ex);
  		        	return (mapping.findForward("failure"));
  		        }
--- 116,120 ----
  	
  		        }catch(Exception ex){
! 		            log.error("WLUpdateDisplayWaitingListAction/execute(): Exception: "+ ex);
  		        	return (mapping.findForward("failure"));
  		        }
***************
*** 132,142 ****
          providerNo = (String)session.getAttribute("user");
          
!         System.out.println("WLSetupDisplayWaitingListAction/execute(): providerNo = "+ providerNo);
!         System.out.println("WLSetupDisplayWaitingListAction/execute(): groupno = "+ groupNo);
  
!         System.out.println("WLSetupDisplayWaitingListAction/execute(): waitingListId = "+ waitingListId);
!         System.out.println("WLSetupDisplayWaitingListAction/execute(): demographicNo = "+ demographicNo);
!         System.out.println("WLSetupDisplayWaitingListAction/execute(): waitingListNote = "+ waitingListNote);
!         System.out.println("WLSetupDisplayWaitingListAction/execute(): onListSince = "+ onListSince);
  
          WLWaitingListBeanHandler hd = null;
--- 134,144 ----
          providerNo = (String)session.getAttribute("user");
          
!         log.debug("WLSetupDisplayWaitingListAction/execute(): providerNo = "+ providerNo);
!         log.debug("WLSetupDisplayWaitingListAction/execute(): groupno = "+ groupNo);
  
!         log.debug("WLSetupDisplayWaitingListAction/execute(): waitingListId = "+ waitingListId);
!         log.debug("WLSetupDisplayWaitingListAction/execute(): demographicNo = "+ demographicNo);
!         log.debug("WLSetupDisplayWaitingListAction/execute(): waitingListNote = "+ waitingListNote);
!         log.debug("WLSetupDisplayWaitingListAction/execute(): onListSince = "+ onListSince);
  
          WLWaitingListBeanHandler hd = null;
***************
*** 163,171 ****
          	phd.setThisGroupProviderVector(groupNo);
          	allProviders = phd.getThisGroupProviderVector();
!         	System.out.println("WLSetupDisplayWaitingListAction/execute(): allProviders.size() = "+ allProviders.size());
                  if (allProviders.size()<=0){
                      ProviderData proData = new ProviderData();
                      proData.getProvider(groupNo);
!                     if (!proData.getLast_name().equals("") && proData.getLast_name() != null && !proData.getFirst_name().equals("") && proData.getFirst_name() != null) {
                          ProviderNameBean proNameBean = new ProviderNameBean(proData.getLast_name() + ", " + proData.getFirst_name(), groupNo);
                          allProviders.add(proNameBean);
--- 165,173 ----
          	phd.setThisGroupProviderVector(groupNo);
          	allProviders = phd.getThisGroupProviderVector();
!         	log.debug("WLSetupDisplayWaitingListAction/execute(): allProviders.size() = "+ allProviders.size());
                  if (allProviders.size()<=0){
                      ProviderData proData = new ProviderData();
                      proData.getProvider(groupNo);
!                     if (proData.getLast_name() != null && !proData.getLast_name().equals("") && proData.getFirst_name() != null && !proData.getFirst_name().equals("")) {
                          ProviderNameBean proNameBean = new ProviderNameBean(proData.getLast_name() + ", " + proData.getFirst_name(), groupNo);
                          allProviders.add(proNameBean);