craigmcc 01/08/20 11:28:40
Modified: digester/src/java/org/apache/commons/digester
CallMethodRule.java CallParamRule.java
FactoryCreateRule.java ObjectCreateRule.java
SetNextRule.java SetPropertiesRule.java
SetPropertyRule.java SetTopRule.java
Log:
Add toString() methods to all existing Rule implementations to make
debugging and logging output messages more comprehensible.
Revision Changes Path
1.6 +29 -4
jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java
Index: CallMethodRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CallMethodRule.java 2001/08/20 16:10:13 1.5
+++ CallMethodRule.java 2001/08/20 18:28:40 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java,v
1.5 2001/08/20 16:10:13 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2001/08/20 16:10:13 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java,v
1.6 2001/08/20 18:28:40 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/08/20 18:28:40 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
*
* @author Craig McClanahan
* @author Scott Sanders
- * @version $Revision: 1.5 $ $Date: 2001/08/20 16:10:13 $
+ * @version $Revision: 1.6 $ $Date: 2001/08/20 18:28:40 $
*/
public class CallMethodRule extends Rule {
@@ -296,6 +296,31 @@
public void finish() throws Exception {
bodyText = null;
+
+ }
+
+
+ /**
+ * Render a printable version of this Rule.
+ */
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer("CallMethodRule[");
+ sb.append("methodName=");
+ sb.append(methodName);
+ sb.append(", paramCount=");
+ sb.append(paramCount);
+ sb.append(", paramTypes={");
+ if (paramTypes != null) {
+ for (int i = 0; i < paramTypes.length; i++) {
+ if (i > 0)
+ sb.append(", ");
+ sb.append(paramTypes[i].getName());
+ }
+ }
+ sb.append("}");
+ sb.append("]");
+ return (sb.toString());
}
1.4 +20 -4
jakarta-commons/digester/src/java/org/apache/commons/digester/CallParamRule.java
Index: CallParamRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/CallParamRule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CallParamRule.java 2001/08/20 16:10:13 1.3
+++ CallParamRule.java 2001/08/20 18:28:40 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/CallParamRule.java,v
1.3 2001/08/20 16:10:13 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/08/20 16:10:13 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/CallParamRule.java,v
1.4 2001/08/20 18:28:40 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/08/20 18:28:40 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* by a surrounding CallMethodRule rule.
*
* @author Craig McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/08/20 16:10:13 $
+ * @version $Revision: 1.4 $ $Date: 2001/08/20 18:28:40 $
*/
public class CallParamRule extends Rule {
@@ -181,6 +181,22 @@
public void finish() throws Exception {
bodyText = null;
+
+ }
+
+
+ /**
+ * Render a printable version of this Rule.
+ */
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer("CallParamRule[");
+ sb.append("paramIndex=");
+ sb.append(paramIndex);
+ sb.append(", attributeName=");
+ sb.append(attributeName);
+ sb.append("]");
+ return (sb.toString());
}
1.4 +21 -1
jakarta-commons/digester/src/java/org/apache/commons/digester/FactoryCreateRule.java
Index: FactoryCreateRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/FactoryCreateRule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FactoryCreateRule.java 2001/08/20 16:10:13 1.3
+++ FactoryCreateRule.java 2001/08/20 18:28:40 1.4
@@ -74,7 +74,7 @@
* in a call to either a factory method or to a non-empty constructor.
*
* @author Robert Burrell Donkin
- * @version $Revision: 1.3 $ $Date: 2001/08/20 16:10:13 $
+ * @version $Revision: 1.4 $ $Date: 2001/08/20 18:28:40 $
*/
public class FactoryCreateRule extends Rule {
@@ -196,6 +196,26 @@
if (attributeName != null)
creationFactory = null;
+
+ }
+
+
+ /**
+ * Render a printable version of this Rule.
+ */
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer("FactoryCreateRule[");
+ sb.append("className=");
+ sb.append(className);
+ sb.append(", attributeName=");
+ sb.append(attributeName);
+ if (creationFactory != null) {
+ sb.append(", creationFactory=");
+ sb.append(creationFactory);
+ }
+ sb.append("]");
+ return (sb.toString());
}
1.6 +20 -4
jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectCreateRule.java
Index: ObjectCreateRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectCreateRule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ObjectCreateRule.java 2001/08/20 16:10:13 1.5
+++ ObjectCreateRule.java 2001/08/20 18:28:40 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectCreateRule.java,v
1.5 2001/08/20 16:10:13 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2001/08/20 16:10:13 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectCreateRule.java,v
1.6 2001/08/20 18:28:40 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/08/20 18:28:40 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
*
* @author Craig McClanahan
* @author Scott Sanders
- * @version $Revision: 1.5 $ $Date: 2001/08/20 16:10:13 $
+ * @version $Revision: 1.6 $ $Date: 2001/08/20 18:28:40 $
*/
public class ObjectCreateRule extends Rule {
@@ -166,6 +166,22 @@
Object top = digester.pop();
if (digester.getDebug() >= 1)
digester.log("Pop " + top.getClass().getName());
+
+ }
+
+
+ /**
+ * Render a printable version of this Rule.
+ */
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer("ObjectCreateRule[");
+ sb.append("className=");
+ sb.append(className);
+ sb.append(", attributeName=");
+ sb.append(attributeName);
+ sb.append("]");
+ return (sb.toString());
}
1.6 +20 -4
jakarta-commons/digester/src/java/org/apache/commons/digester/SetNextRule.java
Index: SetNextRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetNextRule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SetNextRule.java 2001/08/20 16:10:13 1.5
+++ SetNextRule.java 2001/08/20 18:28:40 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetNextRule.java,v
1.5 2001/08/20 16:10:13 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2001/08/20 16:10:13 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetNextRule.java,v
1.6 2001/08/20 18:28:40 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/08/20 18:28:40 $
*
* ====================================================================
*
@@ -75,7 +75,7 @@
*
* @author Craig McClanahan
* @author Scott Sanders
- * @version $Revision: 1.5 $ $Date: 2001/08/20 16:10:13 $
+ * @version $Revision: 1.6 $ $Date: 2001/08/20 18:28:40 $
*/
public class SetNextRule extends Rule {
@@ -158,6 +158,22 @@
paramTypes[0] = child.getClass();
Method method = parent.getClass().getMethod(methodName, paramTypes);
method.invoke(parent, new Object[] { child });
+
+ }
+
+
+ /**
+ * Render a printable version of this Rule.
+ */
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer("SetNextRule[");
+ sb.append("methodName=");
+ sb.append(methodName);
+ sb.append(", paramType=");
+ sb.append(paramType);
+ sb.append("]");
+ return (sb.toString());
}
1.4 +16 -4
jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java
Index: SetPropertiesRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetPropertiesRule.java 2001/08/15 20:35:43 1.3
+++ SetPropertiesRule.java 2001/08/20 18:28:40 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java,v
1.3 2001/08/15 20:35:43 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/08/15 20:35:43 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java,v
1.4 2001/08/20 18:28:40 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/08/20 18:28:40 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* stack, based on attributes with corresponding names.
*
* @author Craig McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/08/15 20:35:43 $
+ * @version $Revision: 1.4 $ $Date: 2001/08/20 18:28:40 $
*/
public class SetPropertiesRule extends Rule {
@@ -124,6 +124,18 @@
digester.log("Set " + top.getClass().getName() + " properties");
BeanUtils.populate(top, values);
+
+ }
+
+
+ /**
+ * Render a printable version of this Rule.
+ */
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer("SetPropertiesRule[");
+ sb.append("]");
+ return (sb.toString());
}
1.4 +20 -4
jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertyRule.java
Index: SetPropertyRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertyRule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SetPropertyRule.java 2001/08/15 20:35:43 1.3
+++ SetPropertyRule.java 2001/08/20 18:28:40 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertyRule.java,v
1.3 2001/08/15 20:35:43 craigmcc Exp $
- * $Revision: 1.3 $
- * $Date: 2001/08/15 20:35:43 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertyRule.java,v
1.4 2001/08/20 18:28:40 craigmcc Exp $
+ * $Revision: 1.4 $
+ * $Date: 2001/08/20 18:28:40 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* top of the stack, based on attributes with specified names.
*
* @author Craig McClanahan
- * @version $Revision: 1.3 $ $Date: 2001/08/15 20:35:43 $
+ * @version $Revision: 1.4 $ $Date: 2001/08/20 18:28:40 $
*/
public class SetPropertyRule extends Rule {
@@ -149,6 +149,22 @@
digester.log("Set " + top.getClass().getName() + " property " +
actualName + " to " + actualValue);
BeanUtils.populate(top, values);
+
+ }
+
+
+ /**
+ * Render a printable version of this Rule.
+ */
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer("SetPropertyRule[");
+ sb.append("name=");
+ sb.append(name);
+ sb.append(", value=");
+ sb.append(value);
+ sb.append("]");
+ return (sb.toString());
}
1.6 +20 -4
jakarta-commons/digester/src/java/org/apache/commons/digester/SetTopRule.java
Index: SetTopRule.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetTopRule.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SetTopRule.java 2001/08/20 16:10:13 1.5
+++ SetTopRule.java 2001/08/20 18:28:40 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetTopRule.java,v
1.5 2001/08/20 16:10:13 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2001/08/20 16:10:13 $
+ * $Header:
/home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetTopRule.java,v
1.6 2001/08/20 18:28:40 craigmcc Exp $
+ * $Revision: 1.6 $
+ * $Date: 2001/08/20 18:28:40 $
*
* ====================================================================
*
@@ -74,7 +74,7 @@
*
* @author Craig McClanahan
* @author Scott Sanders
- * @version $Revision: 1.5 $ $Date: 2001/08/20 16:10:13 $
+ * @version $Revision: 1.6 $ $Date: 2001/08/20 18:28:40 $
*/
public class SetTopRule extends Rule {
@@ -157,6 +157,22 @@
paramTypes[0] = child.getClass();
Method method = parent.getClass().getMethod(methodName, paramTypes);
method.invoke(parent, new Object[] { child });
+
+ }
+
+
+ /**
+ * Render a printable version of this Rule.
+ */
+ public String toString() {
+
+ StringBuffer sb = new StringBuffer("SetTopRule[");
+ sb.append("methodName=");
+ sb.append(methodName);
+ sb.append(", paramType=");
+ sb.append(paramType);
+ sb.append("]");
+ return (sb.toString());
}
