[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/service ORGManager.java, 1.1, 1.2 LookupManager.java, 1.5, 1.6

[Marc D. <hex...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/service
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22619/web/WEB-INF/classes/src/com/quatro/service

Modified Files:
	LookupManager.java 
Added Files:
	ORGManager.java 
Log Message:
first wave of quatro merges including including updated security framework, org, lookup lists, home page
db patch will not be integrated until merge is complete, and testing has been done


Index: LookupManager.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/service/LookupManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** LookupManager.java	18 Mar 2008 19:41:43 -0000	1.5
--- LookupManager.java	7 Dec 2008 16:54:49 -0000	1.6
***************
*** 6,9 ****
--- 6,10 ----
  import com.quatro.dao.LookupDao;
  import com.quatro.model.LookupTableDefValue;
+ import com.quatro.model.LookupCodeValue;
  
  public class LookupManager {
***************
*** 22,26 ****
      }
  	
! 	public LookupDao getLookupDao() {
  		return lookupDao;
  	}
--- 23,31 ----
      }
  	
!     public LookupCodeValue GetLookupCode(String tableId, String code){
!         return lookupDao.GetCode(tableId, code);
!     }
! 
!     public LookupDao getLookupDao() {
  		return lookupDao;
  	}
***************
*** 46,48 ****
--- 51,58 ----
  		return lookupDao.SaveCodeValue(isNew, tableDef, fieldDefList);
  	}
+ 	
+ 	public int getCountOfActiveClient(String orgCd) throws SQLException{
+    	    return lookupDao.getCountOfActiveClient(orgCd); 
+ 	}
+ 
  }

--- NEW FILE: ORGManager.java ---
package com.quatro.service;


import java.util.List;

import com.quatro.dao.ORGDao;
import com.quatro.model.LookupTableDefValue;

public class ORGManager {
    private ORGDao orgDao=null;
	
    public ORGDao getOrgDao() {
		return orgDao;
	}

	public void setOrgDao(ORGDao orgDao) {
		this.orgDao = orgDao;
	}
	
    public LookupTableDefValue GetLookupTableDef(String tableId){
        return orgDao.GetLookupTableDef(tableId);
    }
	
    public List LoadCodeList(String tableId, boolean activeOnly, String code, String codeDesc) {
        return orgDao.LoadCodeList(tableId, activeOnly, code, codeDesc);
	}
	    
}