diff --git a/projects/samskivert/src/java/com/samskivert/xml/CallMethodSpecialRule.java b/projects/samskivert/src/java/com/samskivert/xml/CallMethodSpecialRule.java index ac4a4237..a63d13c2 100644 --- a/projects/samskivert/src/java/com/samskivert/xml/CallMethodSpecialRule.java +++ b/projects/samskivert/src/java/com/samskivert/xml/CallMethodSpecialRule.java @@ -20,7 +20,6 @@ package com.samskivert.xml; -import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; import com.samskivert.util.StringUtil; @@ -31,11 +30,6 @@ import com.samskivert.util.StringUtil; */ public abstract class CallMethodSpecialRule extends Rule { - public CallMethodSpecialRule (Digester digester) - { - super(digester); - } - public void body (String bodyText) throws Exception { diff --git a/projects/samskivert/src/java/com/samskivert/xml/CheckVersionRule.java b/projects/samskivert/src/java/com/samskivert/xml/CheckVersionRule.java index 9bdcd608..23443d5b 100644 --- a/projects/samskivert/src/java/com/samskivert/xml/CheckVersionRule.java +++ b/projects/samskivert/src/java/com/samskivert/xml/CheckVersionRule.java @@ -20,7 +20,6 @@ package com.samskivert.xml; -import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; import com.samskivert.Log; @@ -41,11 +40,8 @@ public class CheckVersionRule extends Rule * @param parserIdentifier the name of the parser using this rule * which will be reported in the event of a version mismatch. */ - public CheckVersionRule (Digester digester, int version, - String parserIdentifier) + public CheckVersionRule (int version, String parserIdentifier) { - super(digester); - // keep this for later _version = version; _parserIdentifier = parserIdentifier; diff --git a/projects/samskivert/src/java/com/samskivert/xml/SetFieldRule.java b/projects/samskivert/src/java/com/samskivert/xml/SetFieldRule.java index a3d17f64..dd833a37 100644 --- a/projects/samskivert/src/java/com/samskivert/xml/SetFieldRule.java +++ b/projects/samskivert/src/java/com/samskivert/xml/SetFieldRule.java @@ -23,7 +23,6 @@ package com.samskivert.xml; import java.lang.NoSuchFieldException; import java.lang.reflect.Field; -import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; import com.samskivert.util.ValueMarshaller; @@ -37,10 +36,8 @@ public class SetFieldRule extends Rule /** * Constructs a set field rule for the specified field. */ - public SetFieldRule (Digester digester, String fieldName) + public SetFieldRule (String fieldName) { - super(digester); - // keep this for later _fieldName = fieldName; } diff --git a/projects/samskivert/src/java/com/samskivert/xml/SetNextFieldRule.java b/projects/samskivert/src/java/com/samskivert/xml/SetNextFieldRule.java index 652cd174..2368ec39 100644 --- a/projects/samskivert/src/java/com/samskivert/xml/SetNextFieldRule.java +++ b/projects/samskivert/src/java/com/samskivert/xml/SetNextFieldRule.java @@ -22,7 +22,6 @@ package com.samskivert.xml; import java.lang.reflect.Field; -import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; /** @@ -34,10 +33,8 @@ public class SetNextFieldRule extends Rule /** * Constructs a set field rule for the specified field. */ - public SetNextFieldRule (Digester digester, String fieldName) + public SetNextFieldRule (String fieldName) { - super(digester); - // keep this for later _fieldName = fieldName; } diff --git a/projects/samskivert/src/java/com/samskivert/xml/SetPropertyFieldsRule.java b/projects/samskivert/src/java/com/samskivert/xml/SetPropertyFieldsRule.java index 00e0486c..b8854248 100644 --- a/projects/samskivert/src/java/com/samskivert/xml/SetPropertyFieldsRule.java +++ b/projects/samskivert/src/java/com/samskivert/xml/SetPropertyFieldsRule.java @@ -24,7 +24,6 @@ import java.lang.reflect.Field; import java.util.HashMap; import org.xml.sax.Attributes; -import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; import com.samskivert.util.StringUtil; @@ -49,17 +48,16 @@ public class SetPropertyFieldsRule extends Rule /** * Constructs a set property fields rule. */ - public SetPropertyFieldsRule (Digester digester) + public SetPropertyFieldsRule () { - this(digester, true); + this(true); } /** * Constructs a set property fields rule. */ - public SetPropertyFieldsRule (Digester digester, boolean warnNonFields) + public SetPropertyFieldsRule (boolean warnNonFields) { - super(digester); _warnNonFields = warnNonFields; } diff --git a/projects/samskivert/src/java/com/samskivert/xml/ValidatedSetNextRule.java b/projects/samskivert/src/java/com/samskivert/xml/ValidatedSetNextRule.java index b3837e1c..694c013f 100644 --- a/projects/samskivert/src/java/com/samskivert/xml/ValidatedSetNextRule.java +++ b/projects/samskivert/src/java/com/samskivert/xml/ValidatedSetNextRule.java @@ -22,7 +22,6 @@ package com.samskivert.xml; import java.lang.reflect.Method; -import org.apache.commons.digester.Digester; import org.apache.commons.digester.Rule; /** @@ -52,21 +51,18 @@ public class ValidatedSetNextRule extends Rule /** * Constructs a set method rule for the specified method. */ - public ValidatedSetNextRule (Digester digester, String methodName, - Validator validator) + public ValidatedSetNextRule (String methodName, Validator validator) { - this(digester, methodName, null, validator); + this(methodName, null, validator); } /** * Constructs a set method rule for the specified method with the * specified parameter type. */ - public ValidatedSetNextRule (Digester digester, String methodName, - Class paramType, Validator validator) + public ValidatedSetNextRule ( + String methodName, Class paramType, Validator validator) { - super(digester); - // keep this for later _methodName = methodName; _paramType = paramType;