dgraham 2003/07/01 20:47:23
Modified: src/share/org/apache/struts/taglib/html
JavascriptValidatorTag.java
Log:
Renamed some local variables to remove hungarian notation. doStartTag()
is in bad need of refactoring; it's 235 lines long!
Revision Changes Path
1.29 +13 -13
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
Index: JavascriptValidatorTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- JavascriptValidatorTag.java 22 May 2003 01:29:47 -0000 1.28
+++ JavascriptValidatorTag.java 2 Jul 2003 03:47:23 -0000 1.29
@@ -321,8 +321,8 @@
bundle + config.getPrefix(),
PageContext.APPLICATION_SCOPE);
- List lActions = new ArrayList();
- List lActionMethods = new ArrayList();
+ List actions = new ArrayList();
+ List actionMethods = new ArrayList();
// Get List of actions for this Form
for (Iterator i = form.getFields().iterator(); i.hasNext();) {
@@ -331,15 +331,15 @@
for (Iterator x = field.getDependencies().iterator();
x.hasNext();) {
Object o = x.next();
- if (o != null && !lActionMethods.contains(o)) {
- lActionMethods.add(o);
+ if (o != null && !actionMethods.contains(o)) {
+ actionMethods.add(o);
}
}
}
// Create list of ValidatorActions based on lActionMethods
- for (Iterator i = lActionMethods.iterator(); i.hasNext();) {
+ for (Iterator i = actionMethods.iterator(); i.hasNext();) {
String depends = (String) i.next();
ValidatorAction va = resources.getValidatorAction(depends);
@@ -353,13 +353,13 @@
String javascript = va.getJavascript();
if (javascript != null && javascript.length() > 0) {
- lActions.add(va);
+ actions.add(va);
} else {
i.remove();
}
}
- Collections.sort(lActions, new Comparator() {
+ Collections.sort(actions, new Comparator() {
public int compare(Object o1, Object o2) {
ValidatorAction va1 = (ValidatorAction) o1;
ValidatorAction va2 = (ValidatorAction) o2;
@@ -382,7 +382,7 @@
});
String methods = null;
- for (Iterator i = lActions.iterator(); i.hasNext();) {
+ for (Iterator i = actions.iterator(); i.hasNext();) {
ValidatorAction va = (ValidatorAction) i.next();
if (methods == null) {
@@ -394,7 +394,7 @@
results.append(getJavascriptBegin(methods));
- for (Iterator i = lActions.iterator(); i.hasNext();) {
+ for (Iterator i = actions.iterator(); i.hasNext();) {
ValidatorAction va = (ValidatorAction) i.next();
String jscriptVar = null;
String functionName = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
