You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by si...@apache.org on 2011/06/27 17:10:47 UTC

svn commit: r1140200 - in /commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules: AbstractXmlMethodRule.java SetNextRule.java SetRootRule.java SetTopRule.java

Author: simonetripodi
Date: Mon Jun 27 15:10:47 2011
New Revision: 1140200

URL: http://svn.apache.org/viewvc?rev=1140200&view=rev
Log:
added missing exactMatch attribute processing for setTop, setNext and setRoot in xmlrules

Modified:
    commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlMethodRule.java
    commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetNextRule.java
    commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetRootRule.java
    commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetTopRule.java

Modified: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlMethodRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlMethodRule.java?rev=1140200&r1=1140199&r2=1140200&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlMethodRule.java (original)
+++ commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/AbstractXmlMethodRule.java Mon Jun 27 15:10:47 2011
@@ -44,14 +44,16 @@ abstract class AbstractXmlMethodRule
     {
         String methodName = attributes.getValue( "methodname" );
         String paramType = attributes.getValue( "paramtype" );
+        String exactMatch = attributes.getValue( "exactMatch" );
 
-        bindRule( linkedRuleBuilder, methodName, paramType );
+        bindRule( linkedRuleBuilder, methodName, paramType, "true".equals( exactMatch ) );
     }
 
     /**
      * @param methodName
      * @return
      */
-    protected abstract void bindRule( LinkedRuleBuilder linkedRuleBuilder, String methodName, String paramType );
+    protected abstract void bindRule( LinkedRuleBuilder linkedRuleBuilder, String methodName, String paramType,
+                                      boolean exactMatch );
 
 }

Modified: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetNextRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetNextRule.java?rev=1140200&r1=1140199&r2=1140200&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetNextRule.java (original)
+++ commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetNextRule.java Mon Jun 27 15:10:47 2011
@@ -43,7 +43,8 @@ final class SetNextRule
      * {@inheritDoc}
      */
     @Override
-    protected void bindRule( LinkedRuleBuilder linkedRuleBuilder, String methodName, String paramType )
+    protected void bindRule( LinkedRuleBuilder linkedRuleBuilder, String methodName, String paramType,
+                             boolean exactMatch )
     {
         SetNextBuilder builder = linkedRuleBuilder.setNext( methodName );
 
@@ -51,6 +52,8 @@ final class SetNextRule
         {
             builder.withParameterType( paramType );
         }
+
+        builder.useExactMatch( exactMatch );
     }
 
 }

Modified: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetRootRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetRootRule.java?rev=1140200&r1=1140199&r2=1140200&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetRootRule.java (original)
+++ commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetRootRule.java Mon Jun 27 15:10:47 2011
@@ -43,7 +43,8 @@ final class SetRootRule
      * {@inheritDoc}
      */
     @Override
-    protected void bindRule( LinkedRuleBuilder linkedRuleBuilder, String methodName, String paramType )
+    protected void bindRule( LinkedRuleBuilder linkedRuleBuilder, String methodName, String paramType,
+                             boolean exactMatch )
     {
         SetRootBuilder builder = linkedRuleBuilder.setRoot( methodName );
 
@@ -51,6 +52,8 @@ final class SetRootRule
         {
             builder.withParameterType( paramType );
         }
+
+        builder.useExactMatch( exactMatch );
     }
 
 }

Modified: commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetTopRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetTopRule.java?rev=1140200&r1=1140199&r2=1140200&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetTopRule.java (original)
+++ commons/proper/digester/trunk/src/main/java/org/apache/commons/digester3/xmlrules/SetTopRule.java Mon Jun 27 15:10:47 2011
@@ -43,7 +43,8 @@ final class SetTopRule
      * {@inheritDoc}
      */
     @Override
-    protected void bindRule( LinkedRuleBuilder linkedRuleBuilder, String methodName, String paramType )
+    protected void bindRule( LinkedRuleBuilder linkedRuleBuilder, String methodName, String paramType,
+                             boolean exactMatch )
     {
         SetTopBuilder builder = linkedRuleBuilder.setTop( methodName );
 
@@ -51,6 +52,8 @@ final class SetTopRule
         {
             builder.withParameterType( paramType );
         }
+
+        builder.useExactMatch( exactMatch );
     }
 
 }