Updated to reflect new Digester Rule constructor usage.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@1464 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
mdb
2004-07-13 16:12:58 +00:00
parent acb7e459d7
commit 0e9a7c9149
6 changed files with 10 additions and 32 deletions
@@ -20,7 +20,6 @@
package com.samskivert.xml; package com.samskivert.xml;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule; import org.apache.commons.digester.Rule;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
@@ -31,11 +30,6 @@ import com.samskivert.util.StringUtil;
*/ */
public abstract class CallMethodSpecialRule extends Rule public abstract class CallMethodSpecialRule extends Rule
{ {
public CallMethodSpecialRule (Digester digester)
{
super(digester);
}
public void body (String bodyText) public void body (String bodyText)
throws Exception throws Exception
{ {
@@ -20,7 +20,6 @@
package com.samskivert.xml; package com.samskivert.xml;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule; import org.apache.commons.digester.Rule;
import com.samskivert.Log; import com.samskivert.Log;
@@ -41,11 +40,8 @@ public class CheckVersionRule extends Rule
* @param parserIdentifier the name of the parser using this rule * @param parserIdentifier the name of the parser using this rule
* which will be reported in the event of a version mismatch. * which will be reported in the event of a version mismatch.
*/ */
public CheckVersionRule (Digester digester, int version, public CheckVersionRule (int version, String parserIdentifier)
String parserIdentifier)
{ {
super(digester);
// keep this for later // keep this for later
_version = version; _version = version;
_parserIdentifier = parserIdentifier; _parserIdentifier = parserIdentifier;
@@ -23,7 +23,6 @@ package com.samskivert.xml;
import java.lang.NoSuchFieldException; import java.lang.NoSuchFieldException;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule; import org.apache.commons.digester.Rule;
import com.samskivert.util.ValueMarshaller; import com.samskivert.util.ValueMarshaller;
@@ -37,10 +36,8 @@ public class SetFieldRule extends Rule
/** /**
* Constructs a set field rule for the specified field. * 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 // keep this for later
_fieldName = fieldName; _fieldName = fieldName;
} }
@@ -22,7 +22,6 @@ package com.samskivert.xml;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule; import org.apache.commons.digester.Rule;
/** /**
@@ -34,10 +33,8 @@ public class SetNextFieldRule extends Rule
/** /**
* Constructs a set field rule for the specified field. * 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 // keep this for later
_fieldName = fieldName; _fieldName = fieldName;
} }
@@ -24,7 +24,6 @@ import java.lang.reflect.Field;
import java.util.HashMap; import java.util.HashMap;
import org.xml.sax.Attributes; import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule; import org.apache.commons.digester.Rule;
import com.samskivert.util.StringUtil; import com.samskivert.util.StringUtil;
@@ -49,17 +48,16 @@ public class SetPropertyFieldsRule extends Rule
/** /**
* Constructs a set property fields rule. * Constructs a set property fields rule.
*/ */
public SetPropertyFieldsRule (Digester digester) public SetPropertyFieldsRule ()
{ {
this(digester, true); this(true);
} }
/** /**
* Constructs a set property fields rule. * Constructs a set property fields rule.
*/ */
public SetPropertyFieldsRule (Digester digester, boolean warnNonFields) public SetPropertyFieldsRule (boolean warnNonFields)
{ {
super(digester);
_warnNonFields = warnNonFields; _warnNonFields = warnNonFields;
} }
@@ -22,7 +22,6 @@ package com.samskivert.xml;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.Rule; import org.apache.commons.digester.Rule;
/** /**
@@ -52,21 +51,18 @@ public class ValidatedSetNextRule extends Rule
/** /**
* Constructs a set method rule for the specified method. * Constructs a set method rule for the specified method.
*/ */
public ValidatedSetNextRule (Digester digester, String methodName, public ValidatedSetNextRule (String methodName, Validator validator)
Validator validator)
{ {
this(digester, methodName, null, validator); this(methodName, null, validator);
} }
/** /**
* Constructs a set method rule for the specified method with the * Constructs a set method rule for the specified method with the
* specified parameter type. * specified parameter type.
*/ */
public ValidatedSetNextRule (Digester digester, String methodName, public ValidatedSetNextRule (
Class paramType, Validator validator) String methodName, Class paramType, Validator validator)
{ {
super(digester);
// keep this for later // keep this for later
_methodName = methodName; _methodName = methodName;
_paramType = paramType; _paramType = paramType;