dwinterfeldt 01/11/29 13:15:13
Modified: contrib/validator/src/share/com/wintecinc/struts/validation
Arg.java Constant.java Field.java Form.java
FormSet.java Msg.java ValidatorAction.java Var.java
Log:
There was a bug reported (out of memory exception) when loading many forms calling
the toString mehtod on FormSet. I've changed all toString methods to use
StringBuffer. This should help with unessecary object creation.
Revision Changes Path
1.2 +11 -4
jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Arg.java
Index: Arg.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Arg.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Arg.java 2001/07/09 03:23:33 1.1
+++ Arg.java 2001/11/29 21:15:13 1.2
@@ -143,10 +143,17 @@
}
public String toString() {
- String sReturn = "Arg: name=" + name +
- " key=" + key +
- " resource=" + resource + "\n";
- return sReturn;
+ StringBuffer results = new StringBuffer();
+
+ results.append("Arg: name=");
+ results.append(name);
+ results.append(" key=");
+ results.append(key);
+ results.append(" resource=");
+ results.append(resource);
+ results.append("\n");
+
+ return results.toString();
}
}
1.2 +9 -3
jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Constant.java
Index: Constant.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Constant.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Constant.java 2001/07/09 03:23:33 1.1
+++ Constant.java 2001/11/29 21:15:13 1.2
@@ -107,9 +107,15 @@
}
public String toString() {
- String sReturn = "Constant: name=" + name +
- " value=" + value + "\n";
- return sReturn;
+ StringBuffer results = new StringBuffer();
+
+ results.append("Constant: name=");
+ results.append(name);
+ results.append(" value=");
+ results.append(value);
+ results.append("\n");
+
+ return results.toString();
}
}
1.6 +19 -13
jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Field.java
Index: Field.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Field.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Field.java 2001/10/18 06:03:32 1.5
+++ Field.java 2001/11/29 21:15:13 1.6
@@ -627,23 +627,29 @@
}
public String toString() {
- String sReturn = "\t\tkey= " + key + "\n" +
- "\t\tproperty= " + property + "\n" +
- "\t\tindexedProperty= " + indexedProperty + "\n" +
- "\t\tindexedListProperty= " + indexedListProperty + "\n" +
- "\t\tdepends= " + depends + "\n" +
- "\t\tpage= " + page + "\n" +
- "\t\tfieldOrder= " + fieldOrder + "\n";
+ StringBuffer results = new StringBuffer();
+
+ results.append("\t\tkey= " + key + "\n");
+ results.append("\t\tproperty= " + property + "\n");
+ results.append("\t\tindexedProperty= " + indexedProperty + "\n");
+ results.append("\t\tindexedListProperty= " + indexedListProperty + "\n");
+ results.append("\t\tdepends= " + depends + "\n");
+ results.append("\t\tpage= " + page + "\n");
+ results.append("\t\tfieldOrder= " + fieldOrder + "\n");
- if (hVars != null) {
- sReturn += "\t\tVars:\n";
- for (Iterator i = hVars.keySet().iterator(); i.hasNext(); ) {
- Object key = i.next();
- sReturn += "\t\t\t" + key + "=" + hVars.get(key) + "\n";
+ if (hVars != null) {
+ results.append("\t\tVars:\n");
+ for (Iterator i = hVars.keySet().iterator(); i.hasNext(); ) {
+ Object key = i.next();
+ results.append("\t\t\t");
+ results.append(key);
+ results.append("=");
+ results.append(hVars.get(key));
+ results.append("\n");
}
}
- return sReturn;
+ return results.toString();
}
}
1.4 +13 -6
jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Form.java
Index: Form.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Form.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Form.java 2001/09/25 18:07:31 1.3
+++ Form.java 2001/11/29 21:15:13 1.4
@@ -144,12 +144,19 @@
}
public String toString() {
- String sReturn = "Form: " + name + "\n";
- //" validationclass=" + validationclass + "\n";
- for (Iterator i = lFields.iterator(); i.hasNext(); ) {
- sReturn += "\tField: \n" + i.next() + "\n";;
- }
- return sReturn;
+ StringBuffer results = new StringBuffer();
+
+ results.append("Form: ");
+ results.append(name);
+ results.append("\n");
+
+ for (Iterator i = lFields.iterator(); i.hasNext(); ) {
+ results.append("\tField: \n");
+ results.append(i.next());
+ results.append("\n");
+ }
+
+ return results.toString();
}
}
1.3 +17 -5
jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/FormSet.java
Index: FormSet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/FormSet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FormSet.java 2001/08/17 17:40:49 1.2
+++ FormSet.java 2001/11/29 21:15:13 1.3
@@ -207,11 +207,23 @@
}
public String toString() {
- String sReturn = "FormSet: language=" + language + " country=" + country +
- " variant=" + variant + "\n";
- for (Iterator i = getForms().values().iterator(); i.hasNext(); )
- sReturn += " " + i.next().toString() +"\n";
- return sReturn;
+ StringBuffer results = new StringBuffer();
+
+ results.append("FormSet: language=");
+ results.append(language);
+ results.append(" country=");
+ results.append(country);
+ results.append(" variant=");
+ results.append(variant);
+ results.append("\n");
+
+ for (Iterator i = getForms().values().iterator(); i.hasNext(); ) {
+ results.append(" ");
+ results.append(i.next());
+ results.append("\n");
+ }
+
+ return results.toString();
}
}
1.2 +9 -3
jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Msg.java
Index: Msg.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Msg.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Msg.java 2001/07/09 03:23:33 1.1
+++ Msg.java 2001/11/29 21:15:13 1.2
@@ -119,9 +119,15 @@
}
public String toString() {
- String sReturn = "Msg: name=" + name +
- " key=" + key + "\n";
- return sReturn;
+ StringBuffer results = new StringBuffer();
+
+ results.append("Msg: name=");
+ results.append(name);
+ results.append(" key=");
+ results.append(key);
+ results.append("\n");
+
+ return results.toString();
}
}
1.3 +7 -2
jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/ValidatorAction.java
Index: ValidatorAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/ValidatorAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ValidatorAction.java 2001/08/17 17:40:49 1.2
+++ ValidatorAction.java 2001/11/29 21:15:13 1.3
@@ -298,8 +298,13 @@
}
public String toString() {
- String sReturn = "ValidatorAction: " + name + "\n";
- return sReturn;
+ StringBuffer results = new StringBuffer();
+
+ results.append("ValidatorAction: ");
+ results.append(name);
+ results.append("\n");
+
+ return results.toString();
}
}
1.2 +11 -4
jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Var.java
Index: Var.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Var.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Var.java 2001/07/09 03:23:33 1.1
+++ Var.java 2001/11/29 21:15:13 1.2
@@ -169,10 +169,17 @@
}
public String toString() {
- String sReturn = "Var: name=" + name +
- " value=" + value +
- " jsType=" + jsType + "\n";
- return sReturn;
+ StringBuffer results = new StringBuffer();
+
+ results.append("Var: name=");
+ results.append(name);
+ results.append(" value=");
+ results.append(value);
+ results.append(" jsType=");
+ results.append(jsType);
+ results.append("\n");
+
+ return results.toString();
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
