From 33d50bd4e59316c0d05bf1c464c2d790063a8dfc Mon Sep 17 00:00:00 2001 From: mdb Date: Fri, 22 Oct 2004 17:27:53 +0000 Subject: [PATCH] Fixed a bunch of deprecated usages. git-svn-id: https://samskivert.googlecode.com/svn/trunk@1512 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- .../samskivert/xml/CallMethodSpecialRule.java | 12 ++++----- .../com/samskivert/xml/CheckVersionRule.java | 2 +- .../java/com/samskivert/xml/SetFieldRule.java | 16 ++++++----- .../com/samskivert/xml/SetNextFieldRule.java | 8 +++--- .../samskivert/xml/SetPropertyFieldsRule.java | 27 ++++++++++--------- .../samskivert/xml/ValidatedSetNextRule.java | 22 +++++++-------- 6 files changed, 45 insertions(+), 42 deletions(-) diff --git a/projects/samskivert/src/java/com/samskivert/xml/CallMethodSpecialRule.java b/projects/samskivert/src/java/com/samskivert/xml/CallMethodSpecialRule.java index a63d13c2..2113a889 100644 --- a/projects/samskivert/src/java/com/samskivert/xml/CallMethodSpecialRule.java +++ b/projects/samskivert/src/java/com/samskivert/xml/CallMethodSpecialRule.java @@ -30,21 +30,21 @@ import com.samskivert.util.StringUtil; */ public abstract class CallMethodSpecialRule extends Rule { - public void body (String bodyText) + public void body (String namespace, String name, String bodyText) throws Exception { _bodyText = bodyText.trim(); } - public void end () + public void end (String namespace, String name) throws Exception { Object top = digester.peek(); - if (digester.getDebug() >= 1) { - digester.log("CallSpecial " + StringUtil.shortClassName(this) + - ".parseAndSet(" + - StringUtil.shortClassName(top) + ")"); + if (digester.getLogger().isDebugEnabled()) { + digester.getLogger().debug( + "CallSpecial " + StringUtil.shortClassName(this) + + ".parseAndSet(" + StringUtil.shortClassName(top) + ")"); } parseAndSet(_bodyText, top); diff --git a/projects/samskivert/src/java/com/samskivert/xml/CheckVersionRule.java b/projects/samskivert/src/java/com/samskivert/xml/CheckVersionRule.java index 23443d5b..aedd05d9 100644 --- a/projects/samskivert/src/java/com/samskivert/xml/CheckVersionRule.java +++ b/projects/samskivert/src/java/com/samskivert/xml/CheckVersionRule.java @@ -47,7 +47,7 @@ public class CheckVersionRule extends Rule _parserIdentifier = parserIdentifier; } - public void body (String bodyText) + public void body (String namespace, String name, String bodyText) throws Exception { int version = Integer.parseInt(bodyText.trim()); diff --git a/projects/samskivert/src/java/com/samskivert/xml/SetFieldRule.java b/projects/samskivert/src/java/com/samskivert/xml/SetFieldRule.java index dd833a37..33152933 100644 --- a/projects/samskivert/src/java/com/samskivert/xml/SetFieldRule.java +++ b/projects/samskivert/src/java/com/samskivert/xml/SetFieldRule.java @@ -42,19 +42,20 @@ public class SetFieldRule extends Rule _fieldName = fieldName; } - public void body (String bodyText) + public void body (String namespace, String name, String bodyText) throws Exception { _bodyText = bodyText.trim(); } - public void end () + public void end (String namespace, String name) throws Exception { - Object top = digester.peek(); - if (digester.getDebug() >= 1) { - digester.log(" Setting '" + _fieldName + "' to '" + - _bodyText + "' on '" + top + "'."); + Object top = digester.peek(); + if (digester.getLogger().isDebugEnabled()) { + digester.getLogger().debug( + " Setting '" + _fieldName + "' to '" + + _bodyText + "' on '" + top + "'."); } // convert the source string into an object and set the field @@ -64,7 +65,8 @@ public class SetFieldRule extends Rule field.getType(), _bodyText); field.set(top, value); } catch (NoSuchFieldException nsfe) { - digester.log("No such field: " + top.getClass() + "." + _fieldName); + digester.getLogger().warn( + "No such field: " + top.getClass() + "." + _fieldName); } } diff --git a/projects/samskivert/src/java/com/samskivert/xml/SetNextFieldRule.java b/projects/samskivert/src/java/com/samskivert/xml/SetNextFieldRule.java index 2368ec39..f013e64a 100644 --- a/projects/samskivert/src/java/com/samskivert/xml/SetNextFieldRule.java +++ b/projects/samskivert/src/java/com/samskivert/xml/SetNextFieldRule.java @@ -39,7 +39,7 @@ public class SetNextFieldRule extends Rule _fieldName = fieldName; } - public void end () + public void end (String namespace, String name) throws Exception { // identify the objects to be used @@ -47,9 +47,9 @@ public class SetNextFieldRule extends Rule Object parent = digester.peek(1); Class pclass = parent.getClass(); - if (digester.getDebug() >= 1) { - digester.log("Set " + pclass.getName() + "." + _fieldName + - " = " + child); + if (digester.getLogger().isDebugEnabled()) { + digester.getLogger().debug("Set " + pclass.getName() + "." + _fieldName + + " = " + child); } // stuff the child object into the field of the parent diff --git a/projects/samskivert/src/java/com/samskivert/xml/SetPropertyFieldsRule.java b/projects/samskivert/src/java/com/samskivert/xml/SetPropertyFieldsRule.java index b8854248..3202baa3 100644 --- a/projects/samskivert/src/java/com/samskivert/xml/SetPropertyFieldsRule.java +++ b/projects/samskivert/src/java/com/samskivert/xml/SetPropertyFieldsRule.java @@ -81,7 +81,7 @@ public class SetPropertyFieldsRule extends Rule _warnNonFields = warnNonFields; } - public void begin (Attributes attrs) + public void begin (String namespace, String name, Attributes attrs) throws Exception { Object top = digester.peek(); @@ -90,19 +90,20 @@ public class SetPropertyFieldsRule extends Rule // iterate over the attributes, setting public fields where // applicable for (int i = 0; i < attrs.getLength(); i++) { - String name = attrs.getLocalName(i); - if (StringUtil.blank(name)) { - name = attrs.getQName(i); + String lname = attrs.getLocalName(i); + if (StringUtil.blank(lname)) { + lname = attrs.getQName(i); } - // look for a public field with this name + // look for a public field with this lname Field field = null; try { - field = topclass.getField(name); + field = topclass.getField(lname); } catch (NoSuchFieldException nsfe) { if (_warnNonFields) { - digester.log("Skipping property '" + name + - "' for which there is no field."); + digester.getLogger().warn( + "Skipping property '" + lname + + "' for which there is no field."); } continue; } @@ -114,7 +115,7 @@ public class SetPropertyFieldsRule extends Rule // look for a custom field parser if ((_parsers != null) && - ((parser = (FieldParser)_parsers.get(name)) != null)) { + ((parser = (FieldParser)_parsers.get(lname)) != null)) { value = parser.parse(valstr); } else { // otherwise use the value marshaller to parse the @@ -122,14 +123,14 @@ public class SetPropertyFieldsRule extends Rule value = ValueMarshaller.unmarshal(field.getType(), valstr); } - if (digester.getDebug() >= 9) { - digester.log(" Setting property '" + name + "' to '" + - valstr + "'"); + if (digester.getLogger().isDebugEnabled()) { + digester.getLogger().debug(" Setting property '" + lname + + "' to '" + valstr + "'"); } // and finally set the field field.set(top, value); - } + } } protected HashMap _parsers; diff --git a/projects/samskivert/src/java/com/samskivert/xml/ValidatedSetNextRule.java b/projects/samskivert/src/java/com/samskivert/xml/ValidatedSetNextRule.java index 694c013f..255684c8 100644 --- a/projects/samskivert/src/java/com/samskivert/xml/ValidatedSetNextRule.java +++ b/projects/samskivert/src/java/com/samskivert/xml/ValidatedSetNextRule.java @@ -69,12 +69,12 @@ public class ValidatedSetNextRule extends Rule _validator = validator; } - public void end () + public void end (String namespace, String name) throws Exception { - // identify the objects to be used - Object child = digester.peek(0); - Object parent = digester.peek(1); + // identify the objects to be used + Object child = digester.peek(0); + Object parent = digester.peek(1); // make sure the object in question is valid if (!_validator.isValid(child)) { @@ -82,16 +82,16 @@ public class ValidatedSetNextRule extends Rule } Class pclass = parent.getClass(); - if (digester.getDebug() >= 1) { - digester.log("Call " + pclass.getName() + "." + _methodName + - " (" + child + ")"); + if (digester.getLogger().isDebugEnabled()) { + digester.getLogger().debug("Call " + pclass.getName() + "." + + _methodName + " (" + child + ")"); } - // call the specified method - Class[] paramTypes = new Class[1]; + // call the specified method + Class[] paramTypes = new Class[1]; paramTypes[0] = (_paramType == null) ? child.getClass() : _paramType; - Method method = parent.getClass().getMethod(_methodName, paramTypes); - method.invoke(parent, new Object[] { child }); + Method method = parent.getClass().getMethod(_methodName, paramTypes); + method.invoke(parent, new Object[] { child }); } /**