Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D9E9D4940 for ; Wed, 25 May 2011 06:37:34 +0000 (UTC) Received: (qmail 59425 invoked by uid 500); 25 May 2011 06:37:33 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 59376 invoked by uid 500); 25 May 2011 06:37:32 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 59368 invoked by uid 99); 25 May 2011 06:37:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 May 2011 06:37:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 May 2011 06:37:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 62CFC23889E2; Wed, 25 May 2011 06:37:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1127397 - in /commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser: AbstractXmlMethodRule.java SetNextRule.java SetRootRule.java SetTopRule.java Date: Wed, 25 May 2011 06:37:06 -0000 To: commits@commons.apache.org From: simonetripodi@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110525063706.62CFC23889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: simonetripodi Date: Wed May 25 06:37:05 2011 New Revision: 1127397 URL: http://svn.apache.org/viewvc?rev=1127397&view=rev Log: supplied missing/useless ParamTypeBuilder common interface Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/AbstractXmlMethodRule.java commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetNextRule.java commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetRootRule.java commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetTopRule.java Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/AbstractXmlMethodRule.java URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/AbstractXmlMethodRule.java?rev=1127397&r1=1127396&r2=1127397&view=diff ============================================================================== --- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/AbstractXmlMethodRule.java (original) +++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/AbstractXmlMethodRule.java Wed May 25 06:37:05 2011 @@ -17,7 +17,6 @@ */ package org.apache.commons.digester3.xmlrules.metaparser; -import org.apache.commons.digester3.Rule; import org.apache.commons.digester3.binder.LinkedRuleBuilder; import org.apache.commons.digester3.binder.RulesBinder; import org.xml.sax.Attributes; @@ -44,18 +43,13 @@ abstract class AbstractXmlMethodRule String methodName = attributes.getValue( "methodname" ); String paramType = attributes.getValue( "paramtype" ); - ParamTypeBuilder builder = this.createBuilder( linkedRuleBuilder, methodName ); - if ( paramType != null && paramType.length() > 0 ) - { - builder.withParameterType( paramType ); - } + bindRule( linkedRuleBuilder, methodName, paramType ); } /** * @param methodName * @return */ - protected abstract ParamTypeBuilder createBuilder( LinkedRuleBuilder linkedRuleBuilder, - String methodName ); + protected abstract void bindRule( LinkedRuleBuilder linkedRuleBuilder, String methodName, String paramType ); } Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetNextRule.java URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetNextRule.java?rev=1127397&r1=1127396&r2=1127397&view=diff ============================================================================== --- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetNextRule.java (original) +++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetNextRule.java Wed May 25 06:37:05 2011 @@ -17,9 +17,9 @@ */ package org.apache.commons.digester3.xmlrules.metaparser; -import org.apache.commons.digester3.Rule; import org.apache.commons.digester3.binder.LinkedRuleBuilder; import org.apache.commons.digester3.binder.RulesBinder; +import org.apache.commons.digester3.binder.SetNextBuilder; /** * @@ -41,9 +41,14 @@ final class SetNextRule * {@inheritDoc} */ @Override - protected ParamTypeBuilder createBuilder( LinkedRuleBuilder linkedRuleBuilder, String methodName ) + protected void bindRule( LinkedRuleBuilder linkedRuleBuilder, String methodName, String paramType ) { - return linkedRuleBuilder.setNext( methodName ); + SetNextBuilder builder = linkedRuleBuilder.setNext( methodName ); + + if ( paramType != null && paramType.length() > 0 ) + { + builder.withParameterType( paramType ); + } } } Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetRootRule.java URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetRootRule.java?rev=1127397&r1=1127396&r2=1127397&view=diff ============================================================================== --- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetRootRule.java (original) +++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetRootRule.java Wed May 25 06:37:05 2011 @@ -17,9 +17,9 @@ */ package org.apache.commons.digester3.xmlrules.metaparser; -import org.apache.commons.digester3.Rule; import org.apache.commons.digester3.binder.LinkedRuleBuilder; import org.apache.commons.digester3.binder.RulesBinder; +import org.apache.commons.digester3.binder.SetRootBuilder; /** * @@ -41,9 +41,14 @@ final class SetRootRule * {@inheritDoc} */ @Override - protected ParamTypeBuilder createBuilder( LinkedRuleBuilder linkedRuleBuilder, String methodName ) + protected void bindRule( LinkedRuleBuilder linkedRuleBuilder, String methodName, String paramType ) { - return linkedRuleBuilder.setRoot( methodName ); + SetRootBuilder builder = linkedRuleBuilder.setRoot( methodName ); + + if ( paramType != null && paramType.length() > 0 ) + { + builder.withParameterType( paramType ); + } } } Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetTopRule.java URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetTopRule.java?rev=1127397&r1=1127396&r2=1127397&view=diff ============================================================================== --- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetTopRule.java (original) +++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/metaparser/SetTopRule.java Wed May 25 06:37:05 2011 @@ -17,9 +17,9 @@ */ package org.apache.commons.digester3.xmlrules.metaparser; -import org.apache.commons.digester3.Rule; import org.apache.commons.digester3.binder.LinkedRuleBuilder; import org.apache.commons.digester3.binder.RulesBinder; +import org.apache.commons.digester3.binder.SetTopBuilder; /** * @@ -41,9 +41,14 @@ final class SetTopRule * {@inheritDoc} */ @Override - protected ParamTypeBuilder createBuilder( LinkedRuleBuilder linkedRuleBuilder, String methodName ) + protected void bindRule( LinkedRuleBuilder linkedRuleBuilder, String methodName, String paramType ) { - return linkedRuleBuilder.setTop( methodName ); + SetTopBuilder builder = linkedRuleBuilder.setTop( methodName ); + + if ( paramType != null && paramType.length() > 0 ) + { + builder.withParameterType( paramType ); + } } }