Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18712/web/WEB-INF/classes/src/oscar/eform/data
Modified Files:
EForm.java DatabaseAP.java EFormBase.java
Log Message:
change stringbuffers to string builders
Index: EFormBase.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data/EFormBase.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** EFormBase.java 28 Sep 2010 23:07:27 -0000 1.11
--- EFormBase.java 11 Nov 2010 01:35:11 -0000 1.12
***************
*** 30,34 ****
import java.util.Properties;
! import oscar.util.StringBufferUtils;
import oscar.util.UtilDateUtilities;
--- 30,34 ----
import java.util.Properties;
! import oscar.util.StringBuilderUtils;
import oscar.util.UtilDateUtilities;
***************
*** 81,89 ****
String projHome = prop.getProperty("project_home");
String output = "../eform/displayImage.do?imagefile=";
! StringBuffer html = new StringBuffer(formHtml);
! int pointer = StringBufferUtils.indexOfIgnoreCase(html, imageMarker, 0);
while (pointer >= 0) {
html = html.replace(pointer, pointer+imageMarker.length(), output);
! pointer = StringBufferUtils.indexOfIgnoreCase(html, imageMarker, 0);
}
formHtml = html.toString();
--- 81,89 ----
String projHome = prop.getProperty("project_home");
String output = "../eform/displayImage.do?imagefile=";
! StringBuilder html = new StringBuilder(formHtml);
! int pointer = StringBuilderUtils.indexOfIgnoreCase(html, imageMarker, 0);
while (pointer >= 0) {
html = html.replace(pointer, pointer+imageMarker.length(), output);
! pointer = StringBuilderUtils.indexOfIgnoreCase(html, imageMarker, 0);
}
formHtml = html.toString();
Index: EForm.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data/EForm.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** EForm.java 25 Oct 2010 14:25:30 -0000 1.25
--- EForm.java 11 Nov 2010 01:35:11 -0000 1.26
***************
*** 46,50 ****
import oscar.oscarEncounter.oscarMeasurements.bean.EctMeasurementsDataBeanHandler;
import oscar.oscarEncounter.oscarMeasurements.util.WriteNewMeasurements;
! import oscar.util.StringBufferUtils;
import oscar.util.UtilDateUtilities;
--- 46,50 ----
import oscar.oscarEncounter.oscarMeasurements.bean.EctMeasurementsDataBeanHandler;
import oscar.oscarEncounter.oscarMeasurements.util.WriteNewMeasurements;
! import oscar.util.StringBuilderUtils;
import oscar.util.UtilDateUtilities;
***************
*** 136,141 ****
public void setAction(boolean unset) {
// sets action= in the form
! StringBuffer html = new StringBuffer(this.formHtml);
! int index = StringBufferUtils.indexOfIgnoreCase(html, "<form", 0);
int endtag = html.indexOf(">", index + 1);
// --remove all previous actions, methods and names from the form tag
--- 136,141 ----
public void setAction(boolean unset) {
// sets action= in the form
! StringBuilder html = new StringBuilder(this.formHtml);
! int index = StringBuilderUtils.indexOfIgnoreCase(html, "<form", 0);
int endtag = html.indexOf(">", index + 1);
// --remove all previous actions, methods and names from the form tag
***************
*** 143,157 ****
int pointer, pointer2;
! while (((pointer = StringBufferUtils.indexOfIgnoreCase(html, " action=", index)) >= 0) && (pointer < endtag)) {
pointer2 = nextSpot(html, pointer + 1);
html = html.delete(pointer, pointer2);
endtag = html.indexOf(">", index + 1);
}
! while (((pointer = StringBufferUtils.indexOfIgnoreCase(html, " method=", index)) >= 0) && (pointer < endtag)) {
pointer2 = nextSpot(html, pointer + 1);
html = html.delete(pointer, pointer2);
endtag = html.indexOf(">", index + 1);
}
! pointer = StringBufferUtils.indexOfIgnoreCase(html, " name=", index);
String name = "name=\"saveEForm\" ";
if ((pointer >= 0) && (pointer < endtag)) {
--- 143,157 ----
int pointer, pointer2;
! while (((pointer = StringBuilderUtils.indexOfIgnoreCase(html, " action=", index)) >= 0) && (pointer < endtag)) {
pointer2 = nextSpot(html, pointer + 1);
html = html.delete(pointer, pointer2);
endtag = html.indexOf(">", index + 1);
}
! while (((pointer = StringBuilderUtils.indexOfIgnoreCase(html, " method=", index)) >= 0) && (pointer < endtag)) {
pointer2 = nextSpot(html, pointer + 1);
html = html.delete(pointer, pointer2);
endtag = html.indexOf(">", index + 1);
}
! pointer = StringBuilderUtils.indexOfIgnoreCase(html, " name=", index);
String name = "name=\"saveEForm\" ";
if ((pointer >= 0) && (pointer < endtag)) {
***************
*** 166,170 ****
}
index += 5;
! StringBuffer action = new StringBuffer("action=\"../eform/addEForm.do?efmfid=" + this.fid + "&efmdemographic_no=" + this.demographicNo + "&efmprovider_no=" + this.providerNo);
if (this.parentAjaxId != null) action.append("&parentAjaxId=" + this.parentAjaxId);
--- 166,170 ----
}
index += 5;
! StringBuilder action = new StringBuilder("action=\"../eform/addEForm.do?efmfid=" + this.fid + "&efmdemographic_no=" + this.demographicNo + "&efmprovider_no=" + this.providerNo);
if (this.parentAjaxId != null) action.append("&parentAjaxId=" + this.parentAjaxId);
***************
*** 179,186 ****
public void setValues(ArrayList names, ArrayList values) {
if (names.size() != values.size()) return;
! StringBuffer html = new StringBuffer(this.formHtml);
int pointer = 0;
int nameEnd;
! while ((pointer = StringBufferUtils.indexOfIgnoreCase(html, "name=", pointer)) >= 0) {
nameEnd = nextSpot(html, pointer);
if (nameEnd < 0) continue;
--- 179,186 ----
public void setValues(ArrayList names, ArrayList values) {
if (names.size() != values.size()) return;
! StringBuilder html = new StringBuilder(this.formHtml);
int pointer = 0;
int nameEnd;
! while ((pointer = StringBuilderUtils.indexOfIgnoreCase(html, "name=", pointer)) >= 0) {
nameEnd = nextSpot(html, pointer);
if (nameEnd < 0) continue;
***************
*** 201,205 ****
// --------------------------Setting APs utilities----------------------------------------
public void setDatabaseAPs() {
! StringBuffer html = new StringBuffer(this.formHtml);
String marker = EFormLoader.getInstance().getMarker(); // default: marker: "oscarDB="
if (demographicNo == null) demographicNo = "";
--- 201,205 ----
// --------------------------Setting APs utilities----------------------------------------
public void setDatabaseAPs() {
! StringBuilder html = new StringBuilder(this.formHtml);
String marker = EFormLoader.getInstance().getMarker(); // default: marker: "oscarDB="
if (demographicNo == null) demographicNo = "";
***************
*** 364,368 ****
// ----------------------------------private
! private StringBuffer putValue(String value, int pointer, StringBuffer html) {
// inserts value= into tag or textarea
pointer -= 2; // take it back to name^="
--- 364,368 ----
// ----------------------------------private
! private StringBuilder putValue(String value, int pointer, StringBuilder html) {
// inserts value= into tag or textarea
pointer -= 2; // take it back to name^="
***************
*** 381,385 ****
html.insert(pointer, " checked");
} else if (tagType.equals("select")) {
! int endindex = StringBufferUtils.indexOfIgnoreCase(html, "</select>", pointer);
if (endindex < 0) return html; // if closing tag not found
int valueLoc = nextIndex(html, " value=" + value, " value=\"" + value, pointer);
--- 381,385 ----
html.insert(pointer, " checked");
} else if (tagType.equals("select")) {
! int endindex = StringBuilderUtils.indexOfIgnoreCase(html, "</select>", pointer);
if (endindex < 0) return html; // if closing tag not found
int valueLoc = nextIndex(html, " value=" + value, " value=\"" + value, pointer);
***************
*** 405,409 ****
}
! private int nextIndex(StringBuffer text, String option1, String option2, int pointer) {
// returns the index of option1 or option2 whichever one is closer and exists
int index;
--- 405,409 ----
}
! private int nextIndex(StringBuilder text, String option1, String option2, int pointer) {
// returns the index of option1 or option2 whichever one is closer and exists
int index;
***************
*** 416,420 ****
}
! private int nextSpot(StringBuffer text, int pointer) {
int end = nextIndex(text, "\n", "\r", pointer);
if (end < 0) end = text.length();
--- 416,420 ----
}
! private int nextSpot(StringBuilder text, int pointer) {
int end = nextIndex(text, "\n", "\r", pointer);
if (end < 0) end = text.length();
***************
*** 434,438 ****
}
! private String getFieldType(StringBuffer html, int pointer) {
// pointer can be any place in the tag - isolates tag and sends back field type
int open = html.substring(0, pointer).lastIndexOf("<");
--- 434,438 ----
}
! private String getFieldType(StringBuilder html, int pointer) {
// pointer can be any place in the tag - isolates tag and sends back field type
int open = html.substring(0, pointer).lastIndexOf("<");
***************
*** 464,468 ****
}
! private StringBuffer putValue(DatabaseAP ap, String type, int pointer, StringBuffer html) {
// pointer set up to where to write the value
String sql = ap.getApSQL();
--- 464,468 ----
}
! private StringBuilder putValue(DatabaseAP ap, String type, int pointer, StringBuilder html) {
// pointer set up to where to write the value
String sql = ap.getApSQL();
***************
*** 487,491 ****
html.insert(pointer, output);
} else if (type.equals("select")) {
! int selectEnd = StringBufferUtils.indexOfIgnoreCase(html, "</select>", pointer);
if (selectEnd >= 0) {
int valueLoc = nextIndex(html, " value=" + output, " value=\"" + output, pointer);
--- 487,491 ----
html.insert(pointer, output);
} else if (type.equals("select")) {
! int selectEnd = StringBuilderUtils.indexOfIgnoreCase(html, "</select>", pointer);
if (selectEnd >= 0) {
int valueLoc = nextIndex(html, " value=" + output, " value=\"" + output, pointer);
***************
*** 545,555 ****
}
! private int getFieldIndex(StringBuffer html, int from) {
if (html == null) return -1;
Integer[] index = new Integer[3];
! index[0] = StringBufferUtils.indexOfIgnoreCase(html, "<input", from);
! index[1] = StringBufferUtils.indexOfIgnoreCase(html, "<select", from);
! index[2] = StringBufferUtils.indexOfIgnoreCase(html, "<textarea", from);
ArrayList<Integer> list = new ArrayList<Integer>();
--- 545,555 ----
}
! private int getFieldIndex(StringBuilder html, int from) {
if (html == null) return -1;
Integer[] index = new Integer[3];
! index[0] = StringBuilderUtils.indexOfIgnoreCase(html, "<input", from);
! index[1] = StringBuilderUtils.indexOfIgnoreCase(html, "<select", from);
! index[2] = StringBuilderUtils.indexOfIgnoreCase(html, "<textarea", from);
ArrayList<Integer> list = new ArrayList<Integer>();
***************
*** 565,573 ****
private String getFieldHeader(String html, int fieldIndex) {
! StringBuffer sb_html = new StringBuffer(html);
return getFieldHeader(sb_html, fieldIndex);
}
! private String getFieldHeader(StringBuffer html, int fieldIndex) {
if (html == null || fieldIndex < 0) return "";
if (html.charAt(fieldIndex) != '<') return ""; // field header must be "<...>"
--- 565,573 ----
private String getFieldHeader(String html, int fieldIndex) {
! StringBuilder sb_html = new StringBuilder(html);
return getFieldHeader(sb_html, fieldIndex);
}
! private String getFieldHeader(StringBuilder html, int fieldIndex) {
if (html == null || fieldIndex < 0) return "";
if (html.charAt(fieldIndex) != '<') return ""; // field header must be "<...>"
***************
*** 588,592 ****
}
! private void saveFieldValue(StringBuffer html, int fieldIndex) {
String header = getFieldHeader(html, fieldIndex);
if (blank(header)) return;
--- 588,592 ----
}
! private void saveFieldValue(StringBuilder html, int fieldIndex) {
String header = getFieldHeader(html, fieldIndex);
if (blank(header)) return;
Index: DatabaseAP.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/data/DatabaseAP.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DatabaseAP.java 18 Mar 2008 19:41:39 -0000 1.3
--- DatabaseAP.java 11 Nov 2010 01:35:11 -0000 1.4
***************
*** 65,69 ****
public static String parserReplace(String name, String var, String str) {
//replaces <$name$> with var in str
! StringBuffer strb = new StringBuffer(str);
int tagstart = -2;
int tagend;
--- 65,69 ----
public static String parserReplace(String name, String var, String str) {
//replaces <$name$> with var in str
! StringBuilder strb = new StringBuilder(str);
int tagstart = -2;
int tagend;
***************
*** 77,81 ****
}
public static ArrayList parserGetNames(String str) {
! StringBuffer strb = new StringBuffer(str);
ArrayList names = new ArrayList();
int tagstart = -2;
--- 77,81 ----
}
public static ArrayList parserGetNames(String str) {
! StringBuilder strb = new StringBuilder(str);
ArrayList names = new ArrayList();
int tagstart = -2;
***************
*** 89,93 ****
public static String parserClean(String str) {
//removes left over ${...} in str; replaces with ""
! StringBuffer strb = new StringBuffer(str);
int tagstart = -2;
int tagend;
--- 89,93 ----
public static String parserClean(String str) {
//removes left over ${...} in str; replaces with ""
! StringBuilder strb = new StringBuilder(str);
int tagstart = -2;
int tagend;
|