dwinterfeldt 01/08/17 10:40:50
Modified: contrib/validator/src/share/com/wintecinc/struts/validation
Field.java Form.java FormSet.java Validator.java
ValidatorAction.java ValidatorResources.java
ValidatorResourcesInitializer.java
ValidatorUtil.java
Log:
Switch to using commons packages and fix for the JavaScript because float and some
other words are keywords in Netscape.
Revision Changes Path
1.2 +1 -1
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Field.java 2001/07/09 03:23:33 1.1
+++ Field.java 2001/08/17 17:40:49 1.2
@@ -61,7 +61,7 @@
import java.util.Iterator;
import java.util.Map;
import java.util.StringTokenizer;
-import org.apache.struts.util.FastHashMap;
+import org.apache.commons.collections.FastHashMap;
/**
1.2 +1 -1
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Form.java 2001/07/09 03:23:33 1.1
+++ Form.java 2001/08/17 17:40:49 1.2
@@ -61,7 +61,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.struts.util.FastHashMap;
+import org.apache.commons.collections.FastHashMap;
/**
1.2 +1 -1
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FormSet.java 2001/07/09 03:23:33 1.1
+++ FormSet.java 2001/08/17 17:40:49 1.2
@@ -59,7 +59,7 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
-import org.apache.struts.util.FastHashMap;
+import org.apache.commons.collections.FastHashMap;
/**
1.2 +1 -1
jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Validator.java
Index: Validator.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/Validator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Validator.java 2001/07/09 03:23:33 1.1
+++ Validator.java 2001/08/17 17:40:49 1.2
@@ -67,7 +67,7 @@
import java.util.StringTokenizer;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import org.apache.struts.util.PropertyUtils;
+import org.apache.commons.beanutils.PropertyUtils;
/**
* <p>This class performs validations. The methods are can be configured to be
1.2 +20 -1
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValidatorAction.java 2001/07/09 03:23:33 1.1
+++ ValidatorAction.java 2001/08/17 17:40:49 1.2
@@ -62,7 +62,7 @@
import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-import org.apache.struts.util.FastHashMap;
+import org.apache.commons.collections.FastHashMap;
/**
@@ -93,6 +93,7 @@
Validator.SERVLET_CONTEXT_KEY;
private String depends = null;
private String msg = null;
+ private String jsFunctionName = null;
private String javascript = null;
private Object instance = null;
@@ -192,6 +193,24 @@
this.msg = msg;
}
+ /**
+ * Gets the Javascript function name. This is optional and will
+ * be used instead of validator action name for the name of the
+ * Javascript function/object.
+ */
+ public String getJsFunctionName() {
+ return jsFunctionName;
+ }
+
+ /**
+ * Sets the Javascript function name. This is optional and will
+ * be used instead of validator action name for the name of the
+ * Javascript function/object.
+ */
+ public void setJsFunctionName(String jsFunctionName) {
+ this.jsFunctionName = jsFunctionName;
+ }
+
/**
* Gets the Javascript equivalent of the java class and method
* associated with this action.
1.2 +1 -1
jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/ValidatorResources.java
Index: ValidatorResources.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/ValidatorResources.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValidatorResources.java 2001/07/09 03:23:33 1.1
+++ ValidatorResources.java 2001/08/17 17:40:49 1.2
@@ -60,7 +60,7 @@
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
-import org.apache.struts.util.FastHashMap;
+import org.apache.commons.collections.FastHashMap;
/**
1.2 +4 -1
jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/ValidatorResourcesInitializer.java
Index: ValidatorResourcesInitializer.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/ValidatorResourcesInitializer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValidatorResourcesInitializer.java 2001/07/09 03:23:33 1.1
+++ ValidatorResourcesInitializer.java 2001/08/17 17:40:49 1.2
@@ -59,7 +59,7 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import org.apache.struts.digester.Digester;
+import org.apache.commons.digester.Digester;
import org.xml.sax.SAXException;
@@ -141,7 +141,10 @@
Digester digester = new Digester();
digester.push(resources);
+ digester.setDebug(debug);
+ digester.setNamespaceAware(true);
digester.setValidating(false);
+
// Create Global Constant objects
digester.addObjectCreate("form-validation/global/constant",
"com.wintecinc.struts.validation.Constant",
"className");
1.2 +1 -1
jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/ValidatorUtil.java
Index: ValidatorUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/validator/src/share/com/wintecinc/struts/validation/ValidatorUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValidatorUtil.java 2001/07/09 03:23:33 1.1
+++ ValidatorUtil.java 2001/08/17 17:40:49 1.2
@@ -62,7 +62,7 @@
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.PropertyUtils;
+import org.apache.commons.beanutils.PropertyUtils;
import com.wintecinc.struts.action.ValidatorServlet;
/**
