oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs setting_up_eclipse_with_tomcat.txt, NONE, 1.1

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv29685/docs

Added Files:
	setting_up_eclipse_with_tomcat.txt 
Log Message:
doc on using eclipse with tomcat embedded

--- NEW FILE: setting_up_eclipse_with_tomcat.txt ---
This is a tres brief document on how to setup tomcat with eclipse.

For this example we will use the integrator project (because the oscar project is not "ready").

Pre-requisites : Eclipse, Tomcat, Java all installed

-----------------------
Setup Tomcat In Eclipse
-----------------------
- On your eclipse top menu : Window -> Show View -> Other -> Servers
- Follow through the menu/question prompts.

There, you're done, you can right click on tomcat and start and stop it now.

-------------------
New Project example
-------------------
- On Eclipse, create a new project, in the project wizard select Web -> Dynamic Web Project.
- In the resulting directory, add /WebContent/index.jsp (WebContent should already exist).
- Right click on the Servers -> Tomcat V6.0 (or what ever you have) -> Add and Remove, add your new project.
- Right click on the Servers -> Tomcat V6.0 -> restart (or start if you didn't previously)

Done, go to a web browser and look at http://127.0.0.1:8080/test_web/index.jsp and you should see your index page (test_web was my project/context name).

-----------------------------
Existing Project - integrator
-----------------------------
- Check out the new integrator code....
- add the integrator to your server -> tomcat V6.0 ... 
- restart the tomcat and it should work (kind of, you need to setup your recaptcha key).

As for how I did that with the integrator, it's a maven project. To build the eclipse project setup for maven its : mvn eclipse:eclipse
for a web project it's : mvn eclipse:eclipse -Dwtpversion=1.5 (where the 1.5 is what ever WTP version you're running)

I've commited the eclipse settings so everyone gets them now.

[Oscarmcmaster-cvscommit] oscar_mcmaster/docs gerrit_working_model.txt, 1.12, 1.13

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/docs
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23947/docs

Modified Files:
	gerrit_working_model.txt 
Log Message:
fixed command

Index: gerrit_working_model.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/docs/gerrit_working_model.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** gerrit_working_model.txt	9 Nov 2010 08:00:19 -0000	1.12
--- gerrit_working_model.txt	11 Nov 2010 01:49:37 -0000	1.13
***************
*** 113,117 ****
  - gerrit.sh stop
  - cd /var/gerrit/review_site/git
! - cp /tmp/test2/.git test2.git
  - cp test.git/config test2.git/config
  - in mysql : insert into projects (use_contributor_agreements,submit_type,name) values ('N','M','test2');
--- 113,117 ----
  - gerrit.sh stop
  - cd /var/gerrit/review_site/git
! - cp -r /tmp/test2/.git test2.git
  - cp test.git/config test2.git/config
  - in mysql : insert into projects (use_contributor_agreements,submit_type,name) values ('N','M','test2');

[Oscarmcmaster-cvscommit] oscar_mcmaster/build grep_check_web.data, 1.4, 1.5

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv20925/build

Modified Files:
	grep_check_web.data 
Log Message:
new baseline for codeCheck, significant stringbuffer count reduction

Index: grep_check_web.data
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/grep_check_web.data,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsPitjgv and /tmp/cvstXkFPy differ

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/ClinicalReports ReportEvaluator.java, 1.8, 1.9

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/ClinicalReports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/oscarReport/ClinicalReports

Modified Files:
	ReportEvaluator.java 
Log Message:
change stringbuffers to string builders

Index: ReportEvaluator.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/ClinicalReports/ReportEvaluator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ReportEvaluator.java	22 Jul 2010 18:08:24 -0000	1.8
--- ReportEvaluator.java	11 Nov 2010 01:35:14 -0000	1.9
***************
*** 145,149 ****
      
      public String getName(){
!         StringBuffer  name = new StringBuffer();
          name.append(numerator.getNumeratorName());
          name.append("/");
--- 145,149 ----
      
      public String getName(){
!         StringBuilder  name = new StringBuilder();
          name.append(numerator.getNumeratorName());
          name.append("/");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/web/admin UserManagerAction.java, 1.4, 1.5

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/web/admin
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/com/quatro/web/admin

Modified Files:
	UserManagerAction.java 
Log Message:
change stringbuffers to string builders

Index: UserManagerAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/web/admin/UserManagerAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** UserManagerAction.java	9 Jul 2010 21:37:18 -0000	1.4
--- UserManagerAction.java	11 Nov 2010 01:35:14 -0000	1.5
***************
*** 430,434 ****
  	
  	private String encryptPassword(String password) throws NoSuchAlgorithmException{
! 		StringBuffer sbTemp = new StringBuffer();
  		byte[] pwd = password.getBytes();
  		
--- 430,434 ----
  	
  	private String encryptPassword(String password) throws NoSuchAlgorithmException{
! 		StringBuilder sbTemp = new StringBuilder();
  		byte[] pwd = password.getBytes();
  		

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil RxRePrescribeAction.java, 1.42, 1.43 RxChooseDrugAction.java, 1.20, 1.21 RxWriteScriptAction.java, 1.71, 1.72

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil

Modified Files:
	RxRePrescribeAction.java RxChooseDrugAction.java 
	RxWriteScriptAction.java 
Log Message:
change stringbuffers to string builders

Index: RxRePrescribeAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxRePrescribeAction.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** RxRePrescribeAction.java	6 Aug 2010 03:38:10 -0000	1.42
--- RxRePrescribeAction.java	11 Nov 2010 01:35:14 -0000	1.43
***************
*** 72,76 ****
  		ArrayList<RxPrescriptionData.Prescription> list = rxData.getPrescriptionsByScriptNo(Integer.parseInt(script_no), sessionBeanRX.getDemographicNo());
  		RxPrescriptionData.Prescription p = null;
! 		StringBuffer auditStr = new StringBuffer();
  		for (int idx = 0; idx < list.size(); ++idx) {
  			p = list.get(idx);
--- 72,76 ----
  		ArrayList<RxPrescriptionData.Prescription> list = rxData.getPrescriptionsByScriptNo(Integer.parseInt(script_no), sessionBeanRX.getDemographicNo());
  		RxPrescriptionData.Prescription p = null;
! 		StringBuilder auditStr = new StringBuilder();
  		for (int idx = 0; idx < list.size(); ++idx) {
  			p = list.get(idx);
***************
*** 113,117 ****
  		ArrayList<RxPrescriptionData.Prescription> list = rxData.getPrescriptionsByScriptNo(Integer.parseInt(script_no), sessionBeanRX.getDemographicNo());
  		RxPrescriptionData.Prescription p = null;
! 		StringBuffer auditStr = new StringBuffer();
  		for (int idx = 0; idx < list.size(); ++idx) {
  			p = list.get(idx);
--- 113,117 ----
  		ArrayList<RxPrescriptionData.Prescription> list = rxData.getPrescriptionsByScriptNo(Integer.parseInt(script_no), sessionBeanRX.getDemographicNo());
  		RxPrescriptionData.Prescription p = null;
! 		StringBuilder auditStr = new StringBuilder();
  		for (int idx = 0; idx < list.size(); ++idx) {
  			p = list.get(idx);
***************
*** 142,146 ****
  		}
  		RxDrugListForm frm = (RxDrugListForm) form;
! 		StringBuffer auditStr = new StringBuffer();
  		try {
  			RxPrescriptionData rxData = new RxPrescriptionData();
--- 142,146 ----
  		}
  		RxDrugListForm frm = (RxDrugListForm) form;
! 		StringBuilder auditStr = new StringBuilder();
  		try {
  			RxPrescriptionData rxData = new RxPrescriptionData();
***************
*** 193,197 ****
  			return null;
  		}
! 		StringBuffer auditStr = new StringBuffer();
  
  		RxPrescriptionData rxData = new RxPrescriptionData();
--- 193,197 ----
  			return null;
  		}
! 		StringBuilder auditStr = new StringBuilder();
  
  		RxPrescriptionData rxData = new RxPrescriptionData();
***************
*** 253,257 ****
  			return null;
  		}
! 		StringBuffer auditStr = new StringBuffer();
  
  		RxPrescriptionData rxData = new RxPrescriptionData();
--- 253,257 ----
  			return null;
  		}
! 		StringBuilder auditStr = new StringBuilder();
  
  		RxPrescriptionData rxData = new RxPrescriptionData();
***************
*** 316,320 ****
  			return null;
  		}
! 		StringBuffer auditStr = new StringBuffer();
  		// String idList = request.getParameter("drugIdList");
  
--- 316,320 ----
  			return null;
  		}
! 		StringBuilder auditStr = new StringBuilder();
  		// String idList = request.getParameter("drugIdList");
  

Index: RxChooseDrugAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxChooseDrugAction.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** RxChooseDrugAction.java	21 Oct 2010 22:53:11 -0000	1.20
--- RxChooseDrugAction.java	11 Nov 2010 01:35:14 -0000	1.21
***************
*** 97,103 ****
                      rx.setDosage(dosage);
                   //   p("rx set dosage to: "+dosage);
!                     StringBuffer compString = null;
                      if (f.components != null){
!                         compString = new StringBuffer();
                          for (int c = 0; c < f.components.size();c++){
                              RxDrugData.DrugMonograph.DrugComponent dc = (RxDrugData.DrugMonograph.DrugComponent) f.components.get(c);
--- 97,103 ----
                      rx.setDosage(dosage);
                   //   p("rx set dosage to: "+dosage);
!                     StringBuilder compString = null;
                      if (f.components != null){
!                         compString = new StringBuilder();
                          for (int c = 0; c < f.components.size();c++){
                              RxDrugData.DrugMonograph.DrugComponent dc = (RxDrugData.DrugMonograph.DrugComponent) f.components.get(c);

Index: RxWriteScriptAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxWriteScriptAction.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** RxWriteScriptAction.java	21 Oct 2010 22:53:11 -0000	1.71
--- RxWriteScriptAction.java	11 Nov 2010 01:35:14 -0000	1.72
***************
*** 160,164 ****
  				ArrayList<String> attrib_names = bean.getAttributeNames();
  				// p("attrib_names", attrib_names.toString());
! 				StringBuffer auditStr = new StringBuffer();
  				for (i = 0; i < bean.getStashSize(); i++) {
  					rx = bean.getStashItem(i);
--- 160,164 ----
  				ArrayList<String> attrib_names = bean.getAttributeNames();
  				// p("attrib_names", attrib_names.toString());
! 				StringBuilder auditStr = new StringBuilder();
  				for (i = 0; i < bean.getStashSize(); i++) {
  					rx = bean.getStashItem(i);
***************
*** 992,996 ****
  		RxPrescriptionData prescription = new RxPrescriptionData();
  		String scriptId = prescription.saveScript(bean);
! 		StringBuffer auditStr = new StringBuffer();
  		ArrayList<String> attrib_names = bean.getAttributeNames();
  		for (int i = 0; i < bean.getStashSize(); i++) {
--- 992,996 ----
  		RxPrescriptionData prescription = new RxPrescriptionData();
  		String scriptId = prescription.saveScript(bean);
! 		StringBuilder auditStr = new StringBuilder();
  		ArrayList<String> attrib_names = bean.getAttributeNames();
  		for (int i = 0; i < bean.getStashSize(); i++) {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web CaseManagementViewAction.java, 1.137, 1.138 CaseManagementEntryAction.java, 1.125, 1.126

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web

Modified Files:
	CaseManagementViewAction.java CaseManagementEntryAction.java 
Log Message:
change stringbuffers to string builders

Index: CaseManagementEntryAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web/CaseManagementEntryAction.java,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** CaseManagementEntryAction.java	14 Oct 2010 04:57:36 -0000	1.125
--- CaseManagementEntryAction.java	11 Nov 2010 01:35:14 -0000	1.126
***************
*** 395,399 ****
  
  		if (fwd != null) {
! 			StringBuffer path = new StringBuffer(fwd.getPath());
  
  			if (path.indexOf("?") == -1) path.append("?");
--- 395,399 ----
  
  		if (fwd != null) {
! 			StringBuilder path = new StringBuilder(fwd.getPath());
  
  			if (path.indexOf("?") == -1) path.append("?");
***************
*** 523,527 ****
  		CaseManagementIssue cIssue;
  		boolean issueExists;
! 		StringBuffer issueNames = new StringBuffer();
  		int j;
  
--- 523,527 ----
  		CaseManagementIssue cIssue;
  		boolean issueExists;
! 		StringBuilder issueNames = new StringBuilder();
  		int j;
  
***************
*** 673,677 ****
  		 * Remove linked issue(s) and insert message into note
  		 * 
! 		 * if( removeIssue.equals("true") ) { issue_id = request.getParameterValues("issue_id"); issueSet = note.getIssues(); StringBuffer issueNames = new StringBuffer(); for( int idx = 0; idx < issue_id.length; ++idx ) { for(Iterator iter =
  		 * issueSet.iterator();iter.hasNext();) { CaseManagementIssue cIssue = (CaseManagementIssue)iter.next(); if( cIssue.getIssue_id() == Long.parseLong(issue_id[idx]) ) { issueSet.remove(cIssue); issueNames.append(cIssue.getIssue().getDescription() +
  		 * "\n"); break; } } } //Force hibernate to save rather than update Set tmpIssues = new HashSet(issueSet); note.setIssues(tmpIssues); strNote += "\n" + new SimpleDateFormat("dd-MMM-yyyy").format(new Date()) + " Removed following issue(s):\n" +
--- 673,677 ----
  		 * Remove linked issue(s) and insert message into note
  		 * 
! 		 * if( removeIssue.equals("true") ) { issue_id = request.getParameterValues("issue_id"); issueSet = note.getIssues(); StringBuilder issueNames = new StringBuilder(); for( int idx = 0; idx < issue_id.length; ++idx ) { for(Iterator iter =
  		 * issueSet.iterator();iter.hasNext();) { CaseManagementIssue cIssue = (CaseManagementIssue)iter.next(); if( cIssue.getIssue_id() == Long.parseLong(issue_id[idx]) ) { issueSet.remove(cIssue); issueNames.append(cIssue.getIssue().getDescription() +
  		 * "\n"); break; } } } //Force hibernate to save rather than update Set tmpIssues = new HashSet(issueSet); note.setIssues(tmpIssues); strNote += "\n" + new SimpleDateFormat("dd-MMM-yyyy").format(new Date()) + " Removed following issue(s):\n" +
***************
*** 759,763 ****
  
  		ActionForward forward = mapping.findForward("listCPPNotes");
! 		StringBuffer path = new StringBuffer(forward.getPath());
  		path.append("?" + reloadQuery);
  		return new ActionForward(path.toString());
--- 759,763 ----
  
  		ActionForward forward = mapping.findForward("listCPPNotes");
! 		StringBuilder path = new StringBuilder(forward.getPath());
  		path.append("?" + reloadQuery);
  		return new ActionForward(path.toString());
***************
*** 1220,1224 ****
  			request.getSession().setAttribute(varName, new Boolean(true)); // tell CaseManagementView we have just saved note
  			ActionForward fwd = mapping.findForward(chain);
! 			StringBuffer path = new StringBuffer(fwd.getPath());
  			ResourceBundle props = ResourceBundle.getBundle("oscarResources");
  			if (request.getAttribute("DateError") != null) {
--- 1220,1224 ----
  			request.getSession().setAttribute(varName, new Boolean(true)); // tell CaseManagementView we have just saved note
  			ActionForward fwd = mapping.findForward(chain);
! 			StringBuilder path = new StringBuilder(fwd.getPath());
  			ResourceBundle props = ResourceBundle.getBundle("oscarResources");
  			if (request.getAttribute("DateError") != null) {
***************
*** 1480,1484 ****
  			request.getSession().setAttribute(varName, new Boolean(true)); // tell CaseManagementView we have just saved note
  			ActionForward fwd = mapping.findForward("list");
! 			StringBuffer path = new StringBuffer(fwd.getPath());
  
  			if (path.indexOf("?") == -1) path.append("?");
--- 1480,1484 ----
  			request.getSession().setAttribute(varName, new Boolean(true)); // tell CaseManagementView we have just saved note
  			ActionForward fwd = mapping.findForward("list");
! 			StringBuilder path = new StringBuilder(fwd.getPath());
  
  			if (path.indexOf("?") == -1) path.append("?");
***************
*** 1505,1509 ****
  			Set setIssues = cform.getCaseNote().getIssues();
  			Iterator iter = setIssues.iterator();
! 			StringBuffer dxCodes = new StringBuffer();
  			String strDxCode;
  			int dxNum = 0;
--- 1505,1509 ----
  			Set setIssues = cform.getCaseNote().getIssues();
  			Iterator iter = setIssues.iterator();
! 			StringBuilder dxCodes = new StringBuilder();
  			String strDxCode;
  			int dxNum = 0;
***************
*** 2127,2131 ****
  		request.setAttribute("current", current);
  
! 		StringBuffer title = new StringBuffer();
  		String arrIssues[] = issueIds.split(",");
  		ResourceBundle props = ResourceBundle.getBundle("oscarResources");
--- 2127,2131 ----
  		request.setAttribute("current", current);
  
! 		StringBuilder title = new StringBuilder();
  		String arrIssues[] = issueIds.split(",");
  		ResourceBundle props = ResourceBundle.getBundle("oscarResources");
***************
*** 2426,2430 ****
  	protected CaseManagementCPP copyNote2cpp(CaseManagementCPP cpp, CaseManagementNote note) {
  		Set<CaseManagementIssue> issueSet = note.getIssues();
! 		StringBuffer text = new StringBuffer();
  		Date d = new Date();
  		String separator = "\n-----[[" + d + "]]-----\n";
--- 2426,2430 ----
  	protected CaseManagementCPP copyNote2cpp(CaseManagementCPP cpp, CaseManagementNote note) {
  		Set<CaseManagementIssue> issueSet = note.getIssues();
! 		StringBuilder text = new StringBuilder();
  		Date d = new Date();
  		String separator = "\n-----[[" + d + "]]-----\n";

Index: CaseManagementViewAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web/CaseManagementViewAction.java,v
retrieving revision 1.137
retrieving revision 1.138
diff -C2 -d -r1.137 -r1.138
*** CaseManagementViewAction.java	4 Nov 2010 06:25:15 -0000	1.137
--- CaseManagementViewAction.java	11 Nov 2010 01:35:14 -0000	1.138
***************
*** 1156,1161 ****
  
  		List<Issue> issues = caseManagementMgr.getIssueInfoByCode(providerNo, codes);
! 		StringBuffer checked_issues = new StringBuffer();
! 		StringBuffer cppIssues = new StringBuffer();
  		String[] issueIds = new String[issues.size()];
  		int idx = 0;
--- 1156,1161 ----
  
  		List<Issue> issues = caseManagementMgr.getIssueInfoByCode(providerNo, codes);
! 		StringBuilder checked_issues = new StringBuilder();
! 		StringBuilder cppIssues = new StringBuilder();
  		String[] issueIds = new String[issues.size()];
  		int idx = 0;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/utility GetProviderRoles.java, 1.6, 1.7

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/utility
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/org/oscarehr/PMmodule/utility

Modified Files:
	GetProviderRoles.java 
Log Message:
change stringbuffers to string builders

Index: GetProviderRoles.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/utility/GetProviderRoles.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GetProviderRoles.java	12 Jul 2010 20:04:07 -0000	1.6
--- GetProviderRoles.java	11 Nov 2010 01:35:14 -0000	1.7
***************
*** 64,68 ****
  	    		}
  	    		int x=0;
! 	    		StringBuffer buf = new StringBuffer();
  	    		for(Iterator iter2=roles.iterator();iter2.hasNext();) {
  	    			String roleName= (String)iter2.next();
--- 64,68 ----
  	    		}
  	    		int x=0;
! 	    		StringBuilder buf = new StringBuilder();
  	    		for(Iterator iter2=roles.iterator();iter2.hasNext();) {
  	    			String roleName= (String)iter2.next();

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/pageUtil printLabDaySheetAction.java, 1.5, 1.6 RptRehabStudyAction.java, 1.9, 1.10

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/oscarReport/pageUtil

Modified Files:
	printLabDaySheetAction.java RptRehabStudyAction.java 
Log Message:
change stringbuffers to string builders

Index: printLabDaySheetAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/pageUtil/printLabDaySheetAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** printLabDaySheetAction.java	22 Jul 2010 18:08:25 -0000	1.5
--- printLabDaySheetAction.java	11 Nov 2010 01:35:13 -0000	1.6
***************
*** 89,94 ****
      }
  
!     private StringBuffer getHeader(HttpServletResponse response) {
!         StringBuffer strHeader = new StringBuffer();
          strHeader.append("label_");
          strHeader.append(".pdf");
--- 89,94 ----
      }
  
!     private StringBuilder getHeader(HttpServletResponse response) {
!         StringBuilder strHeader = new StringBuilder();
          strHeader.append("label_");
          strHeader.append(".pdf");
***************
*** 96,100 ****
          response.setDateHeader("Expires", 0);
          response.setContentType("application/pdf");
!         StringBuffer sbContentDispValue = new StringBuffer();
          sbContentDispValue.append("inline; filename="); //inline - display
          sbContentDispValue.append(strHeader);
--- 96,100 ----
          response.setDateHeader("Expires", 0);
          response.setContentType("application/pdf");
!         StringBuilder sbContentDispValue = new StringBuilder();
          sbContentDispValue.append("inline; filename="); //inline - display
          sbContentDispValue.append(strHeader);

Index: RptRehabStudyAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/pageUtil/RptRehabStudyAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RptRehabStudyAction.java	6 Oct 2010 08:03:18 -0000	1.9
--- RptRehabStudyAction.java	11 Nov 2010 01:35:13 -0000	1.10
***************
*** 91,95 ****
  
          // assuming  multiple rows in rs
! 	StringBuffer sb = new StringBuffer();
  
  	ResultSetMetaData rsmd = rs.getMetaData();
--- 91,95 ----
  
          // assuming  multiple rows in rs
! 	StringBuilder sb = new StringBuilder();
  
  	ResultSetMetaData rsmd = rs.getMetaData();
***************
*** 112,116 ****
  
          // assuming  multiple rows in rs
! 	StringBuffer sb = new StringBuffer();
  
  	ResultSetMetaData rsmd = rs.getMetaData();
--- 112,116 ----
  
          // assuming  multiple rows in rs
! 	StringBuilder sb = new StringBuilder();
  
  	ResultSetMetaData rsmd = rs.getMetaData();

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/reportByTemplate ThirdApptTimeReporter.java, 1.8, 1.9 DepressionContinuityReporter.java, 1.6, 1.7 INRReporter.java, 1.5, 1.6

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/reportByTemplate
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/oscarReport/reportByTemplate

Modified Files:
	ThirdApptTimeReporter.java DepressionContinuityReporter.java 
	INRReporter.java 
Log Message:
change stringbuffers to string builders

Index: DepressionContinuityReporter.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/reportByTemplate/DepressionContinuityReporter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DepressionContinuityReporter.java	6 Oct 2010 08:03:20 -0000	1.6
--- DepressionContinuityReporter.java	11 Nov 2010 01:35:13 -0000	1.7
***************
*** 42,49 ****
   */
  public class DepressionContinuityReporter implements Reporter{
!     private StringBuffer rsHtml = new StringBuffer();
!     private StringBuffer csv = new StringBuffer();
!     private HashMap<String,StringBuffer>demographics = new HashMap<String,StringBuffer>();
!     private HashMap<String,StringBuffer>csvMap = new HashMap<String,StringBuffer>();
      /**
       * Creates a new instance of DepressionContinuityReporter
--- 42,49 ----
   */
  public class DepressionContinuityReporter implements Reporter{
!     private StringBuilder rsHtml = new StringBuilder();
!     private StringBuilder csv = new StringBuilder();
!     private HashMap<String,StringBuilder>demographics = new HashMap<String,StringBuilder>();
!     private HashMap<String,StringBuilder>csvMap = new HashMap<String,StringBuilder>();
      /**
       * Creates a new instance of DepressionContinuityReporter
***************
*** 89,94 ****
              rsHtml = this.makeHTMLHeader();
              csv = this.makeCSVHeader();
!             StringBuffer html = new StringBuffer();
!             StringBuffer csvTmp = new StringBuffer();
              String curDemo = null;
              while(rs.next() ) {
--- 89,94 ----
              rsHtml = this.makeHTMLHeader();
              csv = this.makeCSVHeader();
!             StringBuilder html = new StringBuilder();
!             StringBuilder csvTmp = new StringBuilder();
              String curDemo = null;
              while(rs.next() ) {
***************
*** 106,110 ****
                      csvMap.put(curDemo, csvTmp);
                      html = this.addCodeEntry(rs, odd);
!                     csvTmp = new StringBuffer(this.csvCodeEntry(rs));
                  }
                  curDemo = rs.getString(1);
--- 106,110 ----
                      csvMap.put(curDemo, csvTmp);
                      html = this.addCodeEntry(rs, odd);
!                     csvTmp = new StringBuilder(this.csvCodeEntry(rs));
                  }
                  curDemo = rs.getString(1);
***************
*** 131,136 ****
      }
  
!     private StringBuffer addCodeEntry(ResultSet rs, Boolean odd) throws Exception {
!          StringBuffer html = new StringBuffer("<tr class=\"");
          if( odd ) {
              html.append("reportRow1\">");
--- 131,136 ----
      }
  
!     private StringBuilder addCodeEntry(ResultSet rs, Boolean odd) throws Exception {
!          StringBuilder html = new StringBuilder("<tr class=\"");
          if( odd ) {
              html.append("reportRow1\">");
***************
*** 158,162 ****
          Set<String>setDemo = demographics.keySet();
          Iterator<String>iter = setDemo.iterator();
!         StringBuffer demos = new StringBuffer();
          while(iter.hasNext()) {
              demos.append(iter.next());
--- 158,162 ----
          Set<String>setDemo = demographics.keySet();
          Iterator<String>iter = setDemo.iterator();
!         StringBuilder demos = new StringBuilder();
          while(iter.hasNext()) {
              demos.append(iter.next());
***************
*** 218,223 ****
      }
  
!     private StringBuffer makeHTMLHeader() {
!         StringBuffer html = new StringBuffer("<table class=\"reportTable\">\n");
          html.append("<th class=\"reportHeader\">ID</th><th class=\"reportHeader\">Date of Code</th><th class=\"reportHeader\">Dx Code</th>"
                  + "<th class=\"reportHeader\">Date of Visit</th><th class=\"reportHeader\">Provider Seen</th><th class=\"reportHeader\">MRP</th>"
--- 218,223 ----
      }
  
!     private StringBuilder makeHTMLHeader() {
!         StringBuilder html = new StringBuilder("<table class=\"reportTable\">\n");
          html.append("<th class=\"reportHeader\">ID</th><th class=\"reportHeader\">Date of Code</th><th class=\"reportHeader\">Dx Code</th>"
                  + "<th class=\"reportHeader\">Date of Visit</th><th class=\"reportHeader\">Provider Seen</th><th class=\"reportHeader\">MRP</th>"
***************
*** 227,232 ****
      }
  
!     private StringBuffer makeCSVHeader() {
!         StringBuffer cvs = new StringBuffer("ID,Date of Code,Dx Code,Date of Visit,Provider Seen,MRP,Billing Code,Rx Name,Prescriber\n");
          return cvs;
      }
--- 227,232 ----
      }
  
!     private StringBuilder makeCSVHeader() {
!         StringBuilder cvs = new StringBuilder("ID,Date of Code,Dx Code,Date of Visit,Provider Seen,MRP,Billing Code,Rx Name,Prescriber\n");
          return cvs;
      }

Index: INRReporter.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/reportByTemplate/INRReporter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** INRReporter.java	6 Oct 2010 08:03:20 -0000	1.5
--- INRReporter.java	11 Nov 2010 01:35:13 -0000	1.6
***************
*** 49,58 ****
          String fromDate = request.getParameter("from_date");
          String toDate = request.getParameter("to_date");
!         StringBuffer csvBody = new StringBuffer();
!         StringBuffer csvHeader = new StringBuffer();
!         StringBuffer csv = new StringBuffer();
!         StringBuffer rsHtml = new StringBuffer();
!         StringBuffer header = new StringBuffer();
!         StringBuffer body = new StringBuffer();
          int numHeaders = 1;
          int curHeader = 0;
--- 49,58 ----
          String fromDate = request.getParameter("from_date");
          String toDate = request.getParameter("to_date");
!         StringBuilder csvBody = new StringBuilder();
!         StringBuilder csvHeader = new StringBuilder();
!         StringBuilder csv = new StringBuilder();
!         StringBuilder rsHtml = new StringBuilder();
!         StringBuilder header = new StringBuilder();
!         StringBuilder body = new StringBuilder();
          int numHeaders = 1;
          int curHeader = 0;

Index: ThirdApptTimeReporter.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/reportByTemplate/ThirdApptTimeReporter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ThirdApptTimeReporter.java	6 Oct 2010 08:03:20 -0000	1.8
--- ThirdApptTimeReporter.java	11 Nov 2010 01:35:13 -0000	1.9
***************
*** 74,78 ****
          }
  
!         StringBuffer providerList = new StringBuffer();
          for( int idx = 0; idx < providers.length; ++idx ) {
              providerList.append("'" + providers[idx] + "'");
--- 74,78 ----
          }
  
!         StringBuilder providerList = new StringBuilder();
          for( int idx = 0; idx < providers.length; ++idx ) {
              providerList.append("'" + providers[idx] + "'");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/data EctImmImmunizations.java, 1.6, 1.7 EctImmImmunizationSetData.java, 1.15, 1.16

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/data
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/data

Modified Files:
	EctImmImmunizations.java EctImmImmunizationSetData.java 
Log Message:
change stringbuffers to string builders

Index: EctImmImmunizations.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/data/EctImmImmunizations.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** EctImmImmunizations.java	12 Jul 2010 20:04:11 -0000	1.6
--- EctImmImmunizations.java	11 Nov 2010 01:35:13 -0000	1.7
***************
*** 56,60 ****
          for(int r = 0; r < tempIntArray.length; r++)
          {
!             MiscUtils.getLogger().debug(String.valueOf(String.valueOf((new StringBuffer("line ")).append(r).append(" value ").append(tempIntArray[r]))));
              indexAge.setElementAt(Integer.toString(tempIntArray[r]), r);
          }
--- 56,60 ----
          for(int r = 0; r < tempIntArray.length; r++)
          {
!             MiscUtils.getLogger().debug(String.valueOf(String.valueOf((new StringBuilder("line ")).append(r).append(" value ").append(tempIntArray[r]))));
              indexAge.setElementAt(Integer.toString(tempIntArray[r]), r);
          }

Index: EctImmImmunizationSetData.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/immunization/config/data/EctImmImmunizationSetData.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** EctImmImmunizationSetData.java	6 Oct 2010 21:52:13 -0000	1.15
--- EctImmImmunizationSetData.java	11 Nov 2010 01:35:13 -0000	1.16
***************
*** 121,125 ****
  					String.valueOf(
  						(
! 							new StringBuffer("select setXmlDoc from config_Immunization where  setId = '"))
  							.append(setId)
  							.append("'")));
--- 121,125 ----
  					String.valueOf(
  						(
! 							new StringBuilder("select setXmlDoc from config_Immunization where  setId = '"))
  							.append(setId)
  							.append("'")));

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/common DatePickerTag.java, 1.5, 1.6 LookupTag.java, 1.6, 1.7

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/common
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/com/quatro/common

Modified Files:
	DatePickerTag.java LookupTag.java 
Log Message:
change stringbuffers to string builders

Index: DatePickerTag.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/common/DatePickerTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DatePickerTag.java	23 Jun 2009 18:35:38 -0000	1.5
--- DatePickerTag.java	11 Nov 2010 01:35:13 -0000	1.6
***************
*** 143,147 ****
  
          if (indexed) {
!            StringBuffer results = new StringBuffer();
             prepareIndex(results, pre_name);
             results.append(property);
--- 143,147 ----
  
          if (indexed) {
!         	StringBuffer results = new StringBuffer();
             prepareIndex(results, pre_name);
             results.append(property);

Index: LookupTag.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/com/quatro/common/LookupTag.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LookupTag.java	23 Jun 2009 18:35:38 -0000	1.6
--- LookupTag.java	11 Nov 2010 01:35:13 -0000	1.7
***************
*** 62,66 ****
  	    } catch (Exception e) {}
  
!     	StringBuffer results = new StringBuffer("<table");
          prepareAttribute(results, "cellpadding", "0");
          prepareAttribute(results, "style", "border:0px;");
--- 62,66 ----
  	    } catch (Exception e) {}
  
! 	    StringBuffer results = new StringBuffer("<table");
          prepareAttribute(results, "cellpadding", "0");
          prepareAttribute(results, "style", "border:0px;");
***************
*** 150,154 ****
      
      protected String prepareBodyStyles() throws JspException {
!        StringBuffer styles = new StringBuffer();
         prepareAttribute(styles, "style", bodyStyle);
         prepareAttribute(styles, "class", bodyStyleClass);
--- 150,154 ----
      
      protected String prepareBodyStyles() throws JspException {
!     	StringBuffer styles = new StringBuffer();
         prepareAttribute(styles, "style", bodyStyle);
         prepareAttribute(styles, "class", bodyStyleClass);
***************
*** 187,191 ****
  
         if (indexed) {
!           StringBuffer results = new StringBuffer();
            prepareIndex(results, pre_name);
            results.append(property);
--- 187,191 ----
  
         if (indexed) {
!     	   StringBuffer results = new StringBuffer();
            prepareIndex(results, pre_name);
            results.append(property);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic PrintDemoChartLabelAction.java, 1.4, 1.5 PrintDemoLabelAction.java, 1.9, 1.10 PrintDemoAddressLabelAction.java, 1.11, 1.12 PrintBarcodeAction.java, 1.6, 1.7

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/oscarDemographic

Modified Files:
	PrintDemoChartLabelAction.java PrintDemoLabelAction.java 
	PrintDemoAddressLabelAction.java PrintBarcodeAction.java 
Log Message:
change stringbuffers to string builders

Index: PrintDemoChartLabelAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/PrintDemoChartLabelAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PrintDemoChartLabelAction.java	22 Jul 2010 18:08:25 -0000	1.4
--- PrintDemoChartLabelAction.java	11 Nov 2010 01:35:12 -0000	1.5
***************
*** 84,89 ****
      }
  
!     private StringBuffer getHeader(HttpServletResponse response) {
!         StringBuffer strHeader = new StringBuffer();
          strHeader.append("label_");
          strHeader.append(".pdf");
--- 84,89 ----
      }
  
!     private StringBuilder getHeader(HttpServletResponse response) {
!         StringBuilder strHeader = new StringBuilder();
          strHeader.append("label_");
          strHeader.append(".pdf");
***************
*** 91,95 ****
          response.setDateHeader("Expires", 0);
          response.setContentType("application/pdf");
!         StringBuffer sbContentDispValue = new StringBuffer();
          sbContentDispValue.append("inline; filename="); //inline - display
          sbContentDispValue.append(strHeader);
--- 91,95 ----
          response.setDateHeader("Expires", 0);
          response.setContentType("application/pdf");
!         StringBuilder sbContentDispValue = new StringBuilder();
          sbContentDispValue.append("inline; filename="); //inline - display
          sbContentDispValue.append(strHeader);

Index: PrintBarcodeAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/PrintBarcodeAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PrintBarcodeAction.java	6 Oct 2010 08:45:25 -0000	1.6
--- PrintBarcodeAction.java	11 Nov 2010 01:35:13 -0000	1.7
***************
*** 75,80 ****
      }
  
!     private StringBuffer getHeader(HttpServletResponse response) {
!         StringBuffer strHeader = new StringBuffer();
          strHeader.append("label_");
          strHeader.append(".pdf");
--- 75,80 ----
      }
  
!     private StringBuilder getHeader(HttpServletResponse response) {
!         StringBuilder strHeader = new StringBuilder();
          strHeader.append("label_");
          strHeader.append(".pdf");
***************
*** 82,86 ****
          response.setDateHeader("Expires", 0);
          response.setContentType("application/pdf");
!         StringBuffer sbContentDispValue = new StringBuffer();
          sbContentDispValue.append("inline; filename="); //inline - display
          sbContentDispValue.append(strHeader);
--- 82,86 ----
          response.setDateHeader("Expires", 0);
          response.setContentType("application/pdf");
!         StringBuilder sbContentDispValue = new StringBuilder();
          sbContentDispValue.append("inline; filename="); //inline - display
          sbContentDispValue.append(strHeader);

Index: PrintDemoAddressLabelAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/PrintDemoAddressLabelAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PrintDemoAddressLabelAction.java	6 Oct 2010 08:45:25 -0000	1.11
--- PrintDemoAddressLabelAction.java	11 Nov 2010 01:35:12 -0000	1.12
***************
*** 82,87 ****
      }
  
!     private StringBuffer getHeader(HttpServletResponse response) {
!         StringBuffer strHeader = new StringBuffer();
          strHeader.append("label_");
          strHeader.append(".pdf");
--- 82,87 ----
      }
  
!     private StringBuilder getHeader(HttpServletResponse response) {
!         StringBuilder strHeader = new StringBuilder();
          strHeader.append("label_");
          strHeader.append(".pdf");
***************
*** 89,93 ****
          response.setDateHeader("Expires", 0);
          response.setContentType("application/pdf");
!         StringBuffer sbContentDispValue = new StringBuffer();
          sbContentDispValue.append("inline; filename="); //inline - display
          sbContentDispValue.append(strHeader);
--- 89,93 ----
          response.setDateHeader("Expires", 0);
          response.setContentType("application/pdf");
!         StringBuilder sbContentDispValue = new StringBuilder();
          sbContentDispValue.append("inline; filename="); //inline - display
          sbContentDispValue.append(strHeader);

Index: PrintDemoLabelAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDemographic/PrintDemoLabelAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PrintDemoLabelAction.java	22 Jul 2010 18:08:25 -0000	1.9
--- PrintDemoLabelAction.java	11 Nov 2010 01:35:12 -0000	1.10
***************
*** 79,84 ****
      }
  
!     private StringBuffer getHeader(HttpServletResponse response) {
!         StringBuffer strHeader = new StringBuffer();
          strHeader.append("label_");
          strHeader.append(".pdf");
--- 79,84 ----
      }
  
!     private StringBuilder getHeader(HttpServletResponse response) {
!         StringBuilder strHeader = new StringBuilder();
          strHeader.append("label_");
          strHeader.append(".pdf");
***************
*** 86,90 ****
          response.setDateHeader("Expires", 0);
          response.setContentType("application/pdf");
!         StringBuffer sbContentDispValue = new StringBuffer();
          sbContentDispValue.append("inline; filename="); //inline - display
          sbContentDispValue.append(strHeader);
--- 86,90 ----
          response.setDateHeader("Expires", 0);
          response.setContentType("application/pdf");
!         StringBuilder sbContentDispValue = new StringBuilder();
          sbContentDispValue.append("inline; filename="); //inline - display
          sbContentDispValue.append(strHeader);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/graphic FrmGraphicAR.java, 1.8, 1.9 FrmPdfGraphicGrowthChart.java, 1.3, 1.4 FrmPdfGraphicAR.java, 1.7, 1.8

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/graphic
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/form/graphic

Modified Files:
	FrmGraphicAR.java FrmPdfGraphicGrowthChart.java 
	FrmPdfGraphicAR.java 
Log Message:
change stringbuffers to string builders

Index: FrmPdfGraphicAR.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/graphic/FrmPdfGraphicAR.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FrmPdfGraphicAR.java	7 Jul 2010 21:01:33 -0000	1.7
--- FrmPdfGraphicAR.java	11 Nov 2010 01:35:13 -0000	1.8
***************
*** 183,187 ****
  
  		int N = str.length();
! 		StringBuffer sb = new StringBuffer(N);
  		for (int i = 0; i < N; i++) {
  			char c = str.charAt(i);
--- 183,187 ----
  
  		int N = str.length();
! 		StringBuilder sb = new StringBuilder(N);
  		for (int i = 0; i < N; i++) {
  			char c = str.charAt(i);

Index: FrmPdfGraphicGrowthChart.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/graphic/FrmPdfGraphicGrowthChart.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FrmPdfGraphicGrowthChart.java	2 Jul 2010 18:46:09 -0000	1.3
--- FrmPdfGraphicGrowthChart.java	11 Nov 2010 01:35:13 -0000	1.4
***************
*** 96,100 ****
  
          int N = str.length();
!         StringBuffer sb = new StringBuffer(N);
          for (int i = 0; i < N; i++) {
              char c = str.charAt(i);
--- 96,100 ----
  
          int N = str.length();
!         StringBuilder sb = new StringBuilder(N);
          for (int i = 0; i < N; i++) {
              char c = str.charAt(i);

Index: FrmGraphicAR.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/graphic/FrmGraphicAR.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** FrmGraphicAR.java	12 Jul 2010 20:04:11 -0000	1.8
--- FrmGraphicAR.java	11 Nov 2010 01:35:13 -0000	1.9
***************
*** 87,91 ****
  
  		int N=weight.length();
! 		StringBuffer sb=new StringBuffer(N);
  		for(int i=0;i<N;i++){
  			char c=weight.charAt(i);
--- 87,91 ----
  
  		int N=weight.length();
! 		StringBuilder sb=new StringBuilder(N);
  		for(int i=0;i<N;i++){
  			char c=weight.charAt(i);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/survey/dao/oscar/hibernate OscarFormDAOHibernate.java, 1.15, 1.16

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/survey/dao/oscar/hibernate
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/org/oscarehr/survey/dao/oscar/hibernate

Modified Files:
	OscarFormDAOHibernate.java 
Log Message:
change stringbuffers to string builders

Index: OscarFormDAOHibernate.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/survey/dao/oscar/hibernate/OscarFormDAOHibernate.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** OscarFormDAOHibernate.java	12 Jul 2010 20:42:52 -0000	1.15
--- OscarFormDAOHibernate.java	11 Nov 2010 01:35:14 -0000	1.16
***************
*** 471,475 ****
  	private String escapeAndQuote(String value){
          String s = StringHelper.replace(value, String.valueOf(quoteChar), String.valueOf(quoteChar) + String.valueOf(quoteChar));
!         return (new StringBuffer(2 + s.length())).append(quoteChar).append(s).append(quoteChar).toString();
  	}
  	
--- 471,475 ----
  	private String escapeAndQuote(String value){
          String s = StringHelper.replace(value, String.valueOf(quoteChar), String.valueOf(quoteChar) + String.valueOf(quoteChar));
!         return (new StringBuilder(2 + s.length())).append(quoteChar).append(s).append(quoteChar).toString();
  	}
  	

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/CML CMLLabTest.java, 1.18, 1.19

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/CML
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/CML

Modified Files:
	CMLLabTest.java 
Log Message:
change stringbuffers to string builders

Index: CMLLabTest.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/ca/on/CML/CMLLabTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** CMLLabTest.java	6 Oct 2010 21:52:11 -0000	1.18
--- CMLLabTest.java	11 Nov 2010 01:35:13 -0000	1.19
***************
*** 215,219 ****
                  int lenAvail = 20 - ( alist.size() - 1);
                  if ( lenAvail > count){
!                     StringBuffer s = new StringBuffer();
                      for(int i = 0; i < alist.size(); i++){
                          s.append( (String) alist.get(i));
--- 215,219 ----
                  int lenAvail = 20 - ( alist.size() - 1);
                  if ( lenAvail > count){
!                     StringBuilder s = new StringBuilder();
                      for(int i = 0; i < alist.size(); i++){
                          s.append( (String) alist.get(i));
***************
*** 225,229 ****
                  }else{//need to divide up characters
                      int charEach = lenAvail / alist.size();
!                     StringBuffer s = new StringBuffer();
                      for(int i = 0; i < alist.size(); i++){
                          String str = (String) alist.get(i);
--- 225,229 ----
                  }else{//need to divide up characters
                      int charEach = lenAvail / alist.size();
!                     StringBuilder s = new StringBuilder();
                      for(int i = 0; i < alist.size(); i++){
                          String str = (String) alist.get(i);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil EctAddMeasurementStyleSheetAction.java, 1.15, 1.16 EctValidation.java, 1.20, 1.21

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil

Modified Files:
	EctAddMeasurementStyleSheetAction.java EctValidation.java 
Log Message:
change stringbuffers to string builders

Index: EctAddMeasurementStyleSheetAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil/EctAddMeasurementStyleSheetAction.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** EctAddMeasurementStyleSheetAction.java	6 Oct 2010 08:03:20 -0000	1.15
--- EctAddMeasurementStyleSheetAction.java	11 Nov 2010 01:35:13 -0000	1.16
***************
*** 104,108 ****
              
              if(!place.endsWith("/"))
!                     place = new StringBuffer(place).insert(place.length(),"/").toString();
              retVal = place+file.getFileName();
  
--- 104,108 ----
              
              if(!place.endsWith("/"))
!                     place = new StringBuilder(place).insert(place.length(),"/").toString();
              retVal = place+file.getFileName();
  

Index: EctValidation.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/pageUtil/EctValidation.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** EctValidation.java	6 Oct 2010 21:52:11 -0000	1.20
--- EctValidation.java	11 Nov 2010 01:35:13 -0000	1.21
***************
*** 229,233 ****
                       *    place = OscarProperties.getInstance().getProperty("oscarMeasurement_css");
                       *    if(!place.endsWith("/"))
!                      *       place = new StringBuffer(place).insert(place.length(),"/").toString();
                       * } else {
                       *    place = "StreamStyleSheet.do?cssfilename=";
--- 229,233 ----
                       *    place = OscarProperties.getInstance().getProperty("oscarMeasurement_css");
                       *    if(!place.endsWith("/"))
!                      *       place = new StringBuilder(place).insert(place.length(),"/").toString();
                       * } else {
                       *    place = "StreamStyleSheet.do?cssfilename=";

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar Misc.java, 1.34, 1.35 dbBillingData.java, 1.12, 1.13 OscarAction.java, 1.6, 1.7 SxmlMisc.java, 1.8, 1.9

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar

Modified Files:
	Misc.java dbBillingData.java OscarAction.java SxmlMisc.java 
Log Message:
change stringbuffers to string builders

Index: OscarAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/OscarAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OscarAction.java	22 Jul 2010 18:08:26 -0000	1.6
--- OscarAction.java	11 Nov 2010 01:35:13 -0000	1.7
***************
*** 86,90 ****
     * @param docName String
     * @param docType String
!    * @return StringBuffer
     */
    public void cfgHeader(HttpServletResponse response, String docName,
--- 86,90 ----
     * @param docName String
     * @param docType String
!    * @return StringBuilder
     */
    public void cfgHeader(HttpServletResponse response, String docName,

Index: dbBillingData.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dbBillingData.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** dbBillingData.java	6 Oct 2010 21:52:10 -0000	1.12
--- dbBillingData.java	11 Nov 2010 01:35:13 -0000	1.13
***************
*** 85,89 ****
  		String strSQL = "select service_code, description, value, percentage from billingservice where service_code = '" + service_code + "'";
  
! 		temp = searchDB(strSQL, "service_code", "description", "value", "percentage"); // use StringBuffer later
  		if (temp != null) {
  			db_service_code = temp[0];
--- 85,89 ----
  		String strSQL = "select service_code, description, value, percentage from billingservice where service_code = '" + service_code + "'";
  
! 		temp = searchDB(strSQL, "service_code", "description", "value", "percentage"); // use StringBuilder later
  		if (temp != null) {
  			db_service_code = temp[0];

Index: Misc.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/Misc.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Misc.java	6 Oct 2010 22:06:56 -0000	1.34
--- Misc.java	11 Nov 2010 01:35:13 -0000	1.35
***************
*** 64,68 ****
  //		if (null == S) return S;
  //		int N = S.length();
! //		StringBuffer sb = new StringBuffer(N);
  //		for (int i = 0; i < N; i++) {
  //			char c = S.charAt(i);
--- 64,68 ----
  //		if (null == S) return S;
  //		int N = S.length();
! //		StringBuilder sb = new StringBuilder(N);
  //		for (int i = 0; i < N; i++) {
  //			char c = S.charAt(i);
***************
*** 80,84 ****
  		if (null == S) return S;
  		int N = S.length();
! 		StringBuffer sb = new StringBuffer(N);
  		for (int i = 0; i < N; i++) {
  			char c = S.charAt(i);
--- 80,84 ----
  		if (null == S) return S;
  		int N = S.length();
! 		StringBuilder sb = new StringBuilder(N);
  		for (int i = 0; i < N; i++) {
  			char c = S.charAt(i);
***************
*** 95,99 ****
  //		if (null == S) return S;
  //		int N = S.length();
! //		StringBuffer sb = new StringBuffer(N);
  //		for (int i = 0; i < N; i++) {
  //			char c = S.charAt(i);
--- 95,99 ----
  //		if (null == S) return S;
  //		int N = S.length();
! //		StringBuilder sb = new StringBuilder(N);
  //		for (int i = 0; i < N; i++) {
  //			char c = S.charAt(i);
***************
*** 148,152 ****
  		if (null == S) return S;
  		int N = S.length();
! 		StringBuffer sb = new StringBuffer(N);
  		for (int i = 0; i < N; i++) {
  			char c = S.charAt(i);
--- 148,152 ----
  		if (null == S) return S;
  		int N = S.length();
! 		StringBuilder sb = new StringBuilder(N);
  		for (int i = 0; i < N; i++) {
  			char c = S.charAt(i);
***************
*** 162,166 ****
  		if (null == S) return S;
  		int N = S.length();
! 		StringBuffer sb = new StringBuffer(N);
  		for (int i = 0; i < N; i++) {
  			char c = S.charAt(i);
--- 162,166 ----
  		if (null == S) return S;
  		int N = S.length();
! 		StringBuilder sb = new StringBuilder(N);
  		for (int i = 0; i < N; i++) {
  			char c = S.charAt(i);
***************
*** 178,182 ****
  		int N = S.length();
  		boolean bUpper = false;
! 		StringBuffer sb = new StringBuffer(N);
  		for (int i = 0; i < N; i++) {
  			char c = S.charAt(i);
--- 178,182 ----
  		int N = S.length();
  		boolean bUpper = false;
! 		StringBuilder sb = new StringBuilder(N);
  		for (int i = 0; i < N; i++) {
  			char c = S.charAt(i);
***************
*** 205,209 ****
  	public static String stringArrayJoin(String[] A, String S) {
  		if (A == null || A.length == 0) return "";
! 		StringBuffer sb = new StringBuffer();
  		sb.append(A[0]);
  		for (int i = 1; i < A.length; i++) {
--- 205,209 ----
  	public static String stringArrayJoin(String[] A, String S) {
  		if (A == null || A.length == 0) return "";
! 		StringBuilder sb = new StringBuilder();
  		sb.append(A[0]);
  		for (int i = 1; i < A.length; i++) {
***************
*** 407,411 ****
  
  	public static String removeNewLine(String str) {
! 		StringBuffer stringBuffer = new java.lang.StringBuffer();
  		for (int i = 0; i < str.length(); i++) {
  			int a = str.charAt(i);
--- 407,411 ----
  
  	public static String removeNewLine(String str) {
! 		StringBuilder stringBuffer = new java.lang.StringBuilder();
  		for (int i = 0; i < str.length(); i++) {
  			int a = str.charAt(i);
***************
*** 530,534 ****
  	public static String replace(String str, String pattern, String replaceTo) {
  		String[] buff = str.split(pattern);
! 		StringBuffer sb = new StringBuffer();
  
  		sb.append(buff[0]);
--- 530,534 ----
  	public static String replace(String str, String pattern, String replaceTo) {
  		String[] buff = str.split(pattern);
! 		StringBuilder sb = new StringBuilder();
  
  		sb.append(buff[0]);

Index: SxmlMisc.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/SxmlMisc.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SxmlMisc.java	2 Jul 2010 18:46:07 -0000	1.8
--- SxmlMisc.java	11 Nov 2010 01:35:13 -0000	1.9
***************
*** 35,39 ****
    public static String createXmlDataString(HttpServletRequest req, String strPrefix) {
      String temp=null, content="";//default is not null
!     StringBuffer sbContent=new StringBuffer("");
  	  for (Enumeration e = req.getParameterNames() ; e.hasMoreElements() ;) {
  		  temp=e.nextElement().toString();
--- 35,39 ----
    public static String createXmlDataString(HttpServletRequest req, String strPrefix) {
      String temp=null, content="";//default is not null
!     StringBuilder sbContent=new StringBuilder("");
  	  for (Enumeration e = req.getParameterNames() ; e.hasMoreElements() ;) {
  		  temp=e.nextElement().toString();
***************
*** 48,52 ****
    public static String createDataString(HttpServletRequest req, String strPrefix, String defaultValue, int maxsize) {
      String temp=null;//default is not null
!     //StringBuffer sbContent=new StringBuffer("");
      byte[] abyte = new byte[maxsize];
      int i=0,n=0;
--- 48,52 ----
    public static String createDataString(HttpServletRequest req, String strPrefix, String defaultValue, int maxsize) {
      String temp=null;//default is not null
!     //StringBuilder sbContent=new StringBuilder("");
      byte[] abyte = new byte[maxsize];
      int i=0,n=0;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan WCBTeleplanSubmission.java, 1.8, 1.9

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan

Modified Files:
	WCBTeleplanSubmission.java 
Log Message:
change stringbuffers to string builders

Index: WCBTeleplanSubmission.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/Teleplan/WCBTeleplanSubmission.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** WCBTeleplanSubmission.java	12 Jul 2010 20:04:12 -0000	1.8
--- WCBTeleplanSubmission.java	11 Nov 2010 01:35:13 -0000	1.9
***************
*** 94,98 ****
      
      public String validate(WCB wcb,Billingmaster bm){
!         StringBuffer m = new StringBuffer();
          
          try {
--- 94,98 ----
      
      public String validate(WCB wcb,Billingmaster bm){
!         StringBuilder m = new StringBuilder();
          
          try {
***************
*** 178,182 ****
    private String replaceExtendedAskiiValues(String s){
         log.debug("s "+s.length());
!        StringBuffer sb = new StringBuffer();
         for (int i =0; i < s.length(); i++){
             char c = s.charAt(i);
--- 178,182 ----
    private String replaceExtendedAskiiValues(String s){
         log.debug("s "+s.length());
!        StringBuilder sb = new StringBuilder();
         for (int i =0; i < s.length(); i++){
             char c = s.charAt(i);
***************
*** 268,272 ****
      
     private String Claim(String logNo, String billedAmount, String feeitem,String correspondenceCode,Billingmaster bm,WCB wcb) {
!       StringBuffer dLine = new StringBuffer();
        log.debug("Demographic "+demographicDao+"   "+bm.getDemographicNo());
        Demographic d = demographicDao.getDemographic(""+bm.getDemographicNo()); 
--- 268,272 ----
      
     private String Claim(String logNo, String billedAmount, String feeitem,String correspondenceCode,Billingmaster bm,WCB wcb) {
!       StringBuilder dLine = new StringBuilder();
        log.debug("Demographic "+demographicDao+"   "+bm.getDemographicNo());
        Demographic d = demographicDao.getDemographic(""+bm.getDemographicNo()); 

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/dao IssueDAO.java, 1.14, 1.15

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/dao
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/org/oscarehr/casemgmt/dao

Modified Files:
	IssueDAO.java 
Log Message:
change stringbuffers to string builders

Index: IssueDAO.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/dao/IssueDAO.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** IssueDAO.java	14 Oct 2010 11:44:06 -0000	1.14
--- IssueDAO.java	11 Nov 2010 01:35:13 -0000	1.15
***************
*** 83,87 ****
          }
  
!         StringBuffer buf = new StringBuffer();
          for (int x = 0; x < roles.size(); x++) {
              if (x != 0) {
--- 83,87 ----
          }
  
!         StringBuilder buf = new StringBuilder();
          for (int x = 0; x < roles.size(); x++) {
              if (x != 0) {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/data ManageLetters.java, 1.11, 1.12 RptDemographicQueryBuilder.java, 1.17, 1.18 RptResultStruct.java, 1.6, 1.7 DemographicSets.java, 1.11, 1.12 RptReportCreator.java, 1.6, 1.7

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/data
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/oscarReport/data

Modified Files:
	ManageLetters.java RptDemographicQueryBuilder.java 
	RptResultStruct.java DemographicSets.java 
	RptReportCreator.java 
Log Message:
change stringbuffers to string builders

Index: RptResultStruct.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/data/RptResultStruct.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RptResultStruct.java	15 May 2010 22:11:06 -0000	1.6
--- RptResultStruct.java	11 Nov 2010 01:35:12 -0000	1.7
***************
*** 32,36 ****
  
  // assuming  multiple rows in rs
! 	StringBuffer sb = new StringBuffer();
  
  	ResultSetMetaData rsmd = rs.getMetaData();
--- 32,36 ----
  
  // assuming  multiple rows in rs
! 	StringBuilder sb = new StringBuilder();
  
  	ResultSetMetaData rsmd = rs.getMetaData();
***************
*** 79,83 ****
  
  // assuming  multiple rows in rs
! 	StringBuffer sb = new StringBuffer();
          boolean results = true;
  	ResultSetMetaData rsmd = rs.getMetaData();
--- 79,83 ----
  
  // assuming  multiple rows in rs
! 	StringBuilder sb = new StringBuilder();
          boolean results = true;
  	ResultSetMetaData rsmd = rs.getMetaData();

Index: DemographicSets.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/data/DemographicSets.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DemographicSets.java	6 Oct 2010 21:52:09 -0000	1.11
--- DemographicSets.java	11 Nov 2010 01:35:12 -0000	1.12
***************
*** 89,93 ****
     public ArrayList getDemographicSet(ArrayList setNames) {
         ArrayList retval = new ArrayList();
!        StringBuffer strNames = new StringBuffer();
         
         for( int idx = 0; idx < setNames.size(); ++idx ) {
--- 89,93 ----
     public ArrayList getDemographicSet(ArrayList setNames) {
         ArrayList retval = new ArrayList();
!        StringBuilder strNames = new StringBuilder();
         
         for( int idx = 0; idx < setNames.size(); ++idx ) {

Index: RptReportCreator.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/data/RptReportCreator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** RptReportCreator.java	12 Jul 2010 20:04:11 -0000	1.6
--- RptReportCreator.java	11 Nov 2010 01:35:12 -0000	1.7
***************
*** 25,29 ****
      // select formBCAR.pg1_ethOrig as Ethnic Origin, ...
      public String getSelectField(String recordId) throws SQLException {
!         StringBuffer ret = new StringBuffer();
          String sql = "select * from reportConfig where report_id = " + recordId + " order by order_no";
          ResultSet rs = dbObj.searchDBRecord(sql);
--- 25,29 ----
      // select formBCAR.pg1_ethOrig as Ethnic Origin, ...
      public String getSelectField(String recordId) throws SQLException {
!         StringBuilder ret = new StringBuilder();
          String sql = "select * from reportConfig where report_id = " + recordId + " order by order_no";
          ResultSet rs = dbObj.searchDBRecord(sql);

Index: ManageLetters.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/data/ManageLetters.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ManageLetters.java	6 Oct 2010 08:45:24 -0000	1.11
--- ManageLetters.java	11 Nov 2010 01:35:12 -0000	1.12
***************
*** 274,278 ****
      
      private String serializeDemographic(String[] demos){
!         StringBuffer serialString = new StringBuffer();
          if(demos != null){
              for ( int i = 0; i < demos.length; i++){
--- 274,278 ----
      
      private String serializeDemographic(String[] demos){
!         StringBuilder serialString = new StringBuilder();
          if(demos != null){
              for ( int i = 0; i < demos.length; i++){

Index: RptDemographicQueryBuilder.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/data/RptDemographicQueryBuilder.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** RptDemographicQueryBuilder.java	6 Oct 2010 21:52:09 -0000	1.17
--- RptDemographicQueryBuilder.java	11 Nov 2010 01:35:12 -0000	1.18
***************
*** 37,41 ****
      int theWhereFlag;
      int theFirstFlag;
!     StringBuffer stringBuffer = null;
  
      public void whereClause(){
--- 37,41 ----
      int theWhereFlag;
      int theFirstFlag;
!     StringBuilder stringBuffer = null;
  
      public void whereClause(){
***************
*** 66,70 ****
  
          String[] select = frm.getSelect();
!         stringBuffer =  new StringBuffer("select " );
  
          String ageStyle         = frm.getAgeStyle();
--- 66,70 ----
  
          String[] select = frm.getSelect();
!         stringBuffer =  new StringBuilder("select " );
  
          String ageStyle         = frm.getAgeStyle();

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service BedManager.java, 1.27, 1.28

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service

Modified Files:
	BedManager.java 
Log Message:
change stringbuffers to string builders

Index: BedManager.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/service/BedManager.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** BedManager.java	17 Feb 2009 20:13:41 -0000	1.27
--- BedManager.java	11 Nov 2010 01:35:13 -0000	1.28
***************
*** 515,519 ****
  					beds[i].setRoom(roomDAO.getRoom(beds[i].getRoomId()));
  					duplicateBeds.add(beds[i]);
! 					StringBuffer errMsg = new StringBuffer();
  					for (Iterator it = duplicateBeds.iterator(); it.hasNext();) {
  						Bed theBed = (Bed) it.next();
--- 515,519 ----
  					beds[i].setRoom(roomDAO.getRoom(beds[i].getRoomId()));
  					duplicateBeds.add(beds[i]);
! 					StringBuilder errMsg = new StringBuilder();
  					for (Iterator it = duplicateBeds.iterator(); it.hasNext();) {
  						Bed theBed = (Bed) it.next();

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/adapter AnswerScalarDateHtmlAdapter.java, 1.2, 1.3

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/adapter
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/adapter

Modified Files:
	AnswerScalarDateHtmlAdapter.java 
Log Message:
change stringbuffers to string builders

Index: AnswerScalarDateHtmlAdapter.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/adapter/AnswerScalarDateHtmlAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AnswerScalarDateHtmlAdapter.java	2 Sep 2009 20:58:49 -0000	1.2
--- AnswerScalarDateHtmlAdapter.java	11 Nov 2010 01:35:12 -0000	1.3
***************
*** 123,127 ****
  	
  	private String getCalendarScript(String inputId, String buttonId) {		
! 		StringBuffer sb = new StringBuffer();
  		sb.append("<script type=\"text/javascript\">");
  		sb.append("Calendar.setup(");
--- 123,127 ----
  	
  	private String getCalendarScript(String inputId, String buttonId) {		
! 		StringBuilder sb = new StringBuilder();
  		sb.append("<script type=\"text/javascript\">");
  		sb.append("Calendar.setup(");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/formbean GenericIntakeEditFormBean.java, 1.23, 1.24

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/formbean
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/formbean

Modified Files:
	GenericIntakeEditFormBean.java 
Log Message:
change stringbuffers to string builders

Index: GenericIntakeEditFormBean.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/formbean/GenericIntakeEditFormBean.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** GenericIntakeEditFormBean.java	25 Aug 2009 18:22:25 -0000	1.23
--- GenericIntakeEditFormBean.java	11 Nov 2010 01:35:12 -0000	1.24
***************
*** 137,141 ****
  
  	public void setProgramInDomainLabel(boolean hasProgramsInDomain) {
! 		StringBuffer buffer = new StringBuffer();
  
  		if (hasProgramsInDomain) {
--- 137,141 ----
  
  	public void setProgramInDomainLabel(boolean hasProgramsInDomain) {
! 		StringBuilder buffer = new StringBuilder();
  
  		if (hasProgramsInDomain) {
***************
*** 186,190 ****
  
  	public void setExternalProgramLabel(boolean hasExternalPrograms) {
! 		StringBuffer buffer = new StringBuffer();
  
  		if (hasExternalPrograms) {
--- 186,190 ----
  
  	public void setExternalProgramLabel(boolean hasExternalPrograms) {
! 		StringBuilder buffer = new StringBuilder();
  
  		if (hasExternalPrograms) {
***************
*** 230,234 ****
  
  	public void setBedCommunityProgramLabel(boolean hasBedPrograms, boolean hasCommunityPrograms) {
! 		StringBuffer buffer = new StringBuffer();
  
  		if (hasBedPrograms) {
--- 230,234 ----
  
  	public void setBedCommunityProgramLabel(boolean hasBedPrograms, boolean hasCommunityPrograms) {
! 		StringBuilder buffer = new StringBuilder();
  
  		if (hasBedPrograms) {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil EctConTitlebar.java, 1.8, 1.9 EctConDisplayServiceAction.java, 1.11, 1.12 EctConDeleteServicesAction.java, 1.11, 1.12 EctConDisplayServiceUtil.java, 1.12, 1.13 EctConAddServiceAction.java, 1.10, 1.11 EctConConstructSpecialistsScriptsFile.java, 1.14, 1.15

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil

Modified Files:
	EctConTitlebar.java EctConDisplayServiceAction.java 
	EctConDeleteServicesAction.java EctConDisplayServiceUtil.java 
	EctConAddServiceAction.java 
	EctConConstructSpecialistsScriptsFile.java 
Log Message:
change stringbuffers to string builders

Index: EctConDeleteServicesAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConDeleteServicesAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** EctConDeleteServicesAction.java	6 Oct 2010 08:03:25 -0000	1.11
--- EctConDeleteServicesAction.java	11 Nov 2010 01:35:12 -0000	1.12
***************
*** 48,57 ****
        String servs[] = frm.getService();
        if(servs.length > 0) {
!          StringBuffer stringBuffer = new StringBuffer();
           for(int i = 0; i < servs.length; i++)
              if(i == servs.length - 1)
!                stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer(" serviceId = '")).append(servs[i]).append("' "))));
              else
!                stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer(" serviceId = '")).append(servs[i]).append("' or "))));
           
           try {
--- 48,57 ----
        String servs[] = frm.getService();
        if(servs.length > 0) {
!          StringBuilder stringBuffer = new StringBuilder();
           for(int i = 0; i < servs.length; i++)
              if(i == servs.length - 1)
!                stringBuffer.append(String.valueOf(String.valueOf((new StringBuilder(" serviceId = '")).append(servs[i]).append("' "))));
              else
!                stringBuffer.append(String.valueOf(String.valueOf((new StringBuilder(" serviceId = '")).append(servs[i]).append("' or "))));
           
           try {

Index: EctConDisplayServiceAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConDisplayServiceAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** EctConDisplayServiceAction.java	6 Oct 2010 08:03:25 -0000	1.11
--- EctConDisplayServiceAction.java	11 Nov 2010 01:35:12 -0000	1.12
***************
*** 50,57 ****
        try {
           
!          String sql = String.valueOf(String.valueOf((new StringBuffer("delete from serviceSpecialists where serviceId = '")).append(serviceId).append("'")));
           DBHandler.RunSQL(sql);
           for(int i = 0; i < specialists.length; i++) {
!             sql = String.valueOf(String.valueOf((new StringBuffer("insert into serviceSpecialists (serviceId,specId) values ('")).append(serviceId).append("','").append(specialists[i]).append("')")));
              DBHandler.RunSQL(sql);
           }
--- 50,57 ----
        try {
           
!          String sql = String.valueOf(String.valueOf((new StringBuilder("delete from serviceSpecialists where serviceId = '")).append(serviceId).append("'")));
           DBHandler.RunSQL(sql);
           for(int i = 0; i < specialists.length; i++) {
!             sql = String.valueOf(String.valueOf((new StringBuilder("insert into serviceSpecialists (serviceId,specId) values ('")).append(serviceId).append("','").append(specialists[i]).append("')")));
              DBHandler.RunSQL(sql);
           }

Index: EctConAddServiceAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConAddServiceAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EctConAddServiceAction.java	6 Oct 2010 08:03:25 -0000	1.10
--- EctConAddServiceAction.java	11 Nov 2010 01:35:12 -0000	1.11
***************
*** 50,54 ****
          {
              
!             String sql = String.valueOf(String.valueOf((new StringBuffer("insert into consultationServices (serviceDesc,active) values ('")).append(service).append("','1')")));
              DBHandler.RunSQL(sql);
          }
--- 50,54 ----
          {
              
!             String sql = String.valueOf(String.valueOf((new StringBuilder("insert into consultationServices (serviceDesc,active) values ('")).append(service).append("','1')")));
              DBHandler.RunSQL(sql);
          }

Index: EctConDisplayServiceUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConDisplayServiceUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** EctConDisplayServiceUtil.java	6 Oct 2010 21:52:10 -0000	1.12
--- EctConDisplayServiceUtil.java	11 Nov 2010 01:35:12 -0000	1.13
***************
*** 42,46 ****
          {
              
!             String sql = String.valueOf(String.valueOf((new StringBuffer("select serviceDesc from consultationServices where serviceId = '")).append(serId).append("' order by serviceDesc")));
              ResultSet rs = DBHandler.GetSQL(sql);
              if(rs.next())
--- 42,46 ----
          {
              
!             String sql = String.valueOf(String.valueOf((new StringBuilder("select serviceDesc from consultationServices where serviceId = '")).append(serId).append("' order by serviceDesc")));
              ResultSet rs = DBHandler.GetSQL(sql);
              if(rs.next())
***************
*** 99,103 ****
          {
              
!             String sql = String.valueOf(String.valueOf((new StringBuffer("select * from serviceSpecialists where serviceId = '")).append(serviceId).append("'")));
              ResultSet rs;
              for(rs = DBHandler.GetSQL(sql); rs.next(); vector.add(oscar.Misc.getString(rs, "specId")));
--- 99,103 ----
          {
              
!             String sql = String.valueOf(String.valueOf((new StringBuilder("select * from serviceSpecialists where serviceId = '")).append(serviceId).append("'")));
              ResultSet rs;
              for(rs = DBHandler.GetSQL(sql); rs.next(); vector.add(oscar.Misc.getString(rs, "specId")));

Index: EctConTitlebar.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConTitlebar.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** EctConTitlebar.java	2 Jul 2010 18:46:10 -0000	1.8
--- EctConTitlebar.java	11 Nov 2010 01:35:12 -0000	1.9
***************
*** 72,76 ****
      public String estBar(HttpServletRequest request)
      {
!         StringBuffer strBuf = new StringBuffer();
          strBuf.append("<table bgcolor=\"#ffffff\" cellspacing=\"2\">\n");
          strBuf.append("   <tr>\n");
--- 72,76 ----
      public String estBar(HttpServletRequest request)
      {
!         StringBuilder strBuf = new StringBuilder();
          strBuf.append("<table bgcolor=\"#ffffff\" cellspacing=\"2\">\n");
          strBuf.append("   <tr>\n");
***************
*** 88,92 ****
              {
                  strBuf.append("      <td bgcolor=\"#9999ff\">\n");
!                 strBuf.append(String.valueOf(String.valueOf((new StringBuffer("         <a href=")).append((String)jspVect.elementAt(i)).append(" class=\"consultButtonsActive\">").append((String)displayNameVect.elementAt(i)).append("</a>\n"))));
                  strBuf.append("      </td>\n");
              }
--- 88,92 ----
              {
                  strBuf.append("      <td bgcolor=\"#9999ff\">\n");
!                 strBuf.append(String.valueOf(String.valueOf((new StringBuilder("         <a href=")).append((String)jspVect.elementAt(i)).append(" class=\"consultButtonsActive\">").append((String)displayNameVect.elementAt(i)).append("</a>\n"))));
                  strBuf.append("      </td>\n");
              }

Index: EctConConstructSpecialistsScriptsFile.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/config/pageUtil/EctConConstructSpecialistsScriptsFile.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** EctConConstructSpecialistsScriptsFile.java	6 Oct 2010 21:52:10 -0000	1.14
--- EctConConstructSpecialistsScriptsFile.java	11 Nov 2010 01:35:12 -0000	1.15
***************
*** 69,82 ****
                      serviceId.add(oscar.Misc.getString(rs, "serviceId"));
  
!                 MiscUtils.getLogger().debug(String.valueOf(String.valueOf((new StringBuffer("there are ")).append(serviceId.size()).append(" services"))));
                  for(int i = 0; i < serviceId.size(); i++)
                  {
                      String servId = (String)serviceId.elementAt(i);
                      String servDesc = (String)serviceDesc.elementAt(i);
!                     fileWriter.write(String.valueOf(String.valueOf((new StringBuffer("K(")).append(servId).append(",\"").append(servDesc).append("\");\n"))));
!                     sql = String.valueOf(String.valueOf((new StringBuffer("select ser.specId, pro.fName, pro.lName, pro.proLetters, pro.address , pro.phone, pro.fax  from serviceSpecialists ser, professionalSpecialists pro where pro.specId = ser.specId and ser.serviceId = '")).append(servId).append("' order by pro.lName")));
                      for(rs = DBHandler.GetSQL(sql); rs.next(); MiscUtils.getLogger().debug("this went this many times = ".concat(String.valueOf(String.valueOf(servId)))))
                      {
!                         String name = String.valueOf(String.valueOf((new StringBuffer(String.valueOf(String.valueOf(oscar.Misc.getString(rs, "lName"))))).append(", ").append(oscar.Misc.getString(rs, "fName")).append(" ").append(oscar.Misc.getString(rs, "proLetters"))));
                          MiscUtils.getLogger().debug("name : ".concat(String.valueOf(String.valueOf(name))));
                          String specId = oscar.Misc.getString(rs, "specId");
--- 69,82 ----
                      serviceId.add(oscar.Misc.getString(rs, "serviceId"));
  
!                 MiscUtils.getLogger().debug(String.valueOf(String.valueOf((new StringBuilder("there are ")).append(serviceId.size()).append(" services"))));
                  for(int i = 0; i < serviceId.size(); i++)
                  {
                      String servId = (String)serviceId.elementAt(i);
                      String servDesc = (String)serviceDesc.elementAt(i);
!                     fileWriter.write(String.valueOf(String.valueOf((new StringBuilder("K(")).append(servId).append(",\"").append(servDesc).append("\");\n"))));
!                     sql = String.valueOf(String.valueOf((new StringBuilder("select ser.specId, pro.fName, pro.lName, pro.proLetters, pro.address , pro.phone, pro.fax  from serviceSpecialists ser, professionalSpecialists pro where pro.specId = ser.specId and ser.serviceId = '")).append(servId).append("' order by pro.lName")));
                      for(rs = DBHandler.GetSQL(sql); rs.next(); MiscUtils.getLogger().debug("this went this many times = ".concat(String.valueOf(String.valueOf(servId)))))
                      {
!                         String name = String.valueOf(String.valueOf((new StringBuilder(String.valueOf(String.valueOf(oscar.Misc.getString(rs, "lName"))))).append(", ").append(oscar.Misc.getString(rs, "fName")).append(" ").append(oscar.Misc.getString(rs, "proLetters"))));
                          MiscUtils.getLogger().debug("name : ".concat(String.valueOf(String.valueOf(name))));
                          String specId = oscar.Misc.getString(rs, "specId");
***************
*** 84,88 ****
                          String address = oscar.Misc.getString(rs, "address");
                          String fax = oscar.Misc.getString(rs, "fax");
!                         fileWriter.write(String.valueOf(String.valueOf((new StringBuffer("D(")).append(servId).append(",\"").append(specId).append("\",\"").append(phone).append("\",\"").append(name).append("\",\"").append(fax).append("\",\"").append(address).append("\");\n"))));
                      }
  
--- 84,88 ----
                          String address = oscar.Misc.getString(rs, "address");
                          String fax = oscar.Misc.getString(rs, "fax");
!                         fileWriter.write(String.valueOf(String.valueOf((new StringBuilder("D(")).append(servId).append(",\"").append(specId).append("\",\"").append(phone).append("\",\"").append(name).append("\",\"").append(fax).append("\",\"").append(address).append("\");\n"))));
                      }
  
***************
*** 112,116 ****
          serviceDesc = new Vector();
          ResourceBundle props = ResourceBundle.getBundle("oscarResources", locale);
!         StringBuffer stringBuffer = new StringBuffer();
          stringBuffer.append("function makeSpecialistslist(dec){\n");
          stringBuffer.append(" if(dec=='1') \n");
--- 112,116 ----
          serviceDesc = new Vector();
          ResourceBundle props = ResourceBundle.getBundle("oscarResources", locale);
!         StringBuilder stringBuffer = new StringBuilder();
          stringBuffer.append("function makeSpecialistslist(dec){\n");
          stringBuffer.append(" if(dec=='1') \n");
***************
*** 126,139 ****
                  serviceId.add(oscar.Misc.getString(rs, "serviceId"));
  
!             MiscUtils.getLogger().debug(String.valueOf(String.valueOf((new StringBuffer("there are ")).append(serviceId.size()).append(" services"))));
              for(int i = 0; i < serviceId.size(); i++)
              {
                  String servId = (String)serviceId.elementAt(i);
                  String servDesc = (String)serviceDesc.elementAt(i);
!                 stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer("K(")).append(servId).append(",\"").append(servDesc).append("\");\n"))));
!                 sql = String.valueOf(String.valueOf((new StringBuffer("select ser.specId, pro.fName, pro.lName, pro.proLetters, pro.address , pro.phone, pro.fax  from serviceSpecialists ser, professionalSpecialists pro where pro.specId = ser.specId and ser.serviceId = '")).append(servId).append("' order by pro.lName")));
                  for(rs = DBHandler.GetSQL(sql); rs.next(); MiscUtils.getLogger().debug("this went this many times = ".concat(String.valueOf(String.valueOf(servId)))))
                  {
!                     String name = String.valueOf(String.valueOf((new StringBuffer(String.valueOf(String.valueOf(oscar.Misc.getString(rs, "lName"))))).append(", ").append(oscar.Misc.getString(rs, "fName")).append(" ").append(oscar.Misc.getString(rs, "proLetters"))));
                      name = this.escapeString(name);
                      MiscUtils.getLogger().debug("name : ".concat(String.valueOf(String.valueOf(name))));
--- 126,139 ----
                  serviceId.add(oscar.Misc.getString(rs, "serviceId"));
  
!             MiscUtils.getLogger().debug(String.valueOf(String.valueOf((new StringBuilder("there are ")).append(serviceId.size()).append(" services"))));
              for(int i = 0; i < serviceId.size(); i++)
              {
                  String servId = (String)serviceId.elementAt(i);
                  String servDesc = (String)serviceDesc.elementAt(i);
!                 stringBuffer.append(String.valueOf(String.valueOf((new StringBuilder("K(")).append(servId).append(",\"").append(servDesc).append("\");\n"))));
!                 sql = String.valueOf(String.valueOf((new StringBuilder("select ser.specId, pro.fName, pro.lName, pro.proLetters, pro.address , pro.phone, pro.fax  from serviceSpecialists ser, professionalSpecialists pro where pro.specId = ser.specId and ser.serviceId = '")).append(servId).append("' order by pro.lName")));
                  for(rs = DBHandler.GetSQL(sql); rs.next(); MiscUtils.getLogger().debug("this went this many times = ".concat(String.valueOf(String.valueOf(servId)))))
                  {
!                     String name = String.valueOf(String.valueOf((new StringBuilder(String.valueOf(String.valueOf(oscar.Misc.getString(rs, "lName"))))).append(", ").append(oscar.Misc.getString(rs, "fName")).append(" ").append(oscar.Misc.getString(rs, "proLetters"))));
                      name = this.escapeString(name);
                      MiscUtils.getLogger().debug("name : ".concat(String.valueOf(String.valueOf(name))));
***************
*** 143,147 ****
                      address = this.escapeString(address);
                      String fax = oscar.Misc.getString(rs, "fax");
!                     stringBuffer.append(String.valueOf(String.valueOf((new StringBuffer("D(")).append(servId).append(",\"").append(specId).append("\",\"").append(phone).append("\",\"").append(name).append("\",\"").append(fax).append("\",\"").append(address).append("\");\n"))));
                  }
  
--- 143,147 ----
                      address = this.escapeString(address);
                      String fax = oscar.Misc.getString(rs, "fax");
!                     stringBuffer.append(String.valueOf(String.valueOf((new StringBuilder("D(")).append(servId).append(",\"").append(specId).append("\",\"").append(phone).append("\",\"").append(name).append("\",\"").append(fax).append("\",\"").append(address).append("\");\n"))));
                  }