dgraham 2003/05/28 20:04:33
Modified: validator/src/share/org/apache/commons/validator Field.java
Log:
Deprecated public process() method because it should only be
called by the framework. Use getters internally instead of duplicating logic
and casting.
Revision Changes Path
1.15 +9 -7
jakarta-commons/validator/src/share/org/apache/commons/validator/Field.java
Index: Field.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/validator/src/share/org/apache/commons/validator/Field.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Field.java 28 May 2003 04:14:32 -0000 1.14
+++ Field.java 29 May 2003 03:04:33 -0000 1.15
@@ -547,6 +547,8 @@
/**
* Replace constants with values in fields and process the depends field
* to create the dependency <code>Map</code>.
+ * @deprecated This method is called by the framework. It will be made
protected
+ * in a future release. TODO
*/
public void process(Map globalConstants, Map constants) {
this.hMsgs.setFast(false);
@@ -584,7 +586,7 @@
for (Iterator i = hVars.keySet().iterator(); i.hasNext();) {
String key = (String) i.next();
String key2 = TOKEN_START + TOKEN_VAR + key + TOKEN_END;
- Var var = (Var) hVars.get(key);
+ Var var = this.getVar(key);
String replaceValue = var.getValue();
this.processMessageComponents(key2, replaceValue);
@@ -600,7 +602,7 @@
Iterator i = this.hVars.keySet().iterator();
while (i.hasNext()) {
String varKey = (String) i.next();
- Var var = (Var) this.hVars.get(varKey);
+ Var var = this.getVar(varKey);
var.setValue(ValidatorUtils.replace(var.getValue(), key, replaceValue));
}
@@ -626,7 +628,7 @@
if (key != null && !key.startsWith(varKey)) {
for (Iterator i = hMsgs.keySet().iterator(); i.hasNext();) {
String msgKey = (String) i.next();
- String value = (String) hMsgs.get(msgKey);
+ String value = this.getMsg(msgKey);
hMsgs.put(msgKey, ValidatorUtils.replace(value, key, replaceValue));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
