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/05/21 17:15:39 UTC
svn commit: r1125726 - in /commons/sandbox/digester3/trunk/src:
main/java/org/apache/commons/digester3/
main/java/org/apache/commons/digester3/plugins/
main/java/org/apache/commons/digester3/xmlrules/
test/java/org/apache/commons/digester3/
Author: simonetripodi
Date: Sat May 21 15:15:38 2011
New Revision: 1125726
URL: http://svn.apache.org/viewvc?rev=1125726&view=rev
Log:
removed deprecated Rules.match(String) method and updated all related implementations/use
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Rules.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBase.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/DigesterRuleParser.java
commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Rules.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Rules.java?rev=1125726&r1=1125725&r2=1125726&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Rules.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Rules.java Sat May 21 15:15:38 2011
@@ -76,17 +76,6 @@ public interface Rules
* there are no matches. If more than one Rule instance matches, they <strong>must</strong> be returned in the order
* originally registered through the <code>add()</code> method.
*
- * @param pattern Nesting pattern to be matched
- * @deprecated Call match(namespaceURI,pattern) instead.
- */
- @Deprecated
- public List<Rule> match( String pattern );
-
- /**
- * Return a List of all registered Rule instances that match the specified nesting pattern, or a zero-length List if
- * there are no matches. If more than one Rule instance matches, they <strong>must</strong> be returned in the order
- * originally registered through the <code>add()</code> method.
- *
* @param namespaceURI Namespace URI for which to select matching rules, or <code>null</code> to match regardless of
* namespace URI
* @param pattern Nesting pattern to be matched
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBase.java?rev=1125726&r1=1125725&r2=1125726&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBase.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/RulesBase.java Sat May 21 15:15:38 2011
@@ -176,22 +176,6 @@ public class RulesBase
* there are no matches. If more than one Rule instance matches, they <strong>must</strong> be returned in the order
* originally registered through the <code>add()</code> method.
*
- * @param pattern Nesting pattern to be matched
- * @deprecated Call match(namespaceURI,pattern) instead.
- */
- @Deprecated
- public List<Rule> match( String pattern )
- {
-
- return ( match( null, pattern ) );
-
- }
-
- /**
- * Return a List of all registered Rule instances that match the specified nesting pattern, or a zero-length List if
- * there are no matches. If more than one Rule instance matches, they <strong>must</strong> be returned in the order
- * originally registered through the <code>add()</code> method.
- *
* @param namespaceURI Namespace URI for which to select matching rules, or <code>null</code> to match regardless of
* namespace URI
* @param pattern Nesting pattern to be matched
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java?rev=1125726&r1=1125725&r2=1125726&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNestedPropertiesRule.java Sat May 21 15:15:38 2011
@@ -359,11 +359,6 @@ public class SetNestedPropertiesRule
{
}
- public List<Rule> match( String matchPath )
- {
- return match( null, matchPath );
- }
-
public List<Rule> match( String namespaceURI, String matchPath )
{
List<Rule> match = decoratedRules.match( namespaceURI, matchPath );
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java?rev=1125726&r1=1125725&r2=1125726&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/WithDefaultsRulesWrapper.java Sat May 21 15:15:38 2011
@@ -123,11 +123,6 @@ public class WithDefaultsRulesWrapper
// --------------------------------------------------------- Public Methods
- public List<Rule> match( String pattern )
- {
- return match( "", pattern );
- }
-
/**
* Return list of rules matching given pattern. If wrapped implementation returns any matches return those.
* Otherwise, return default matches.
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java?rev=1125726&r1=1125725&r2=1125726&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/plugins/PluginRules.java Sat May 21 15:15:38 2011
@@ -334,20 +334,6 @@ public class PluginRules
}
/**
- * Return a List of all registered Rule instances that match the specified nesting pattern, or a zero-length List if
- * there are no matches. If more than one Rule instance matches, they <strong>must</strong> be returned in the order
- * originally registered through the <code>add()</code> method.
- *
- * @param path the path to the xml nodes to be matched.
- * @deprecated Call match(namespaceURI,pattern) instead.
- */
- @Deprecated
- public List<Rule> match( String path )
- {
- return ( match( null, path ) );
- }
-
- /**
* Return a List of all registered Rule instances that match the specified nodepath, or a zero-length List if there
* are no matches. If more than one Rule instance matches, they <strong>must</strong> be returned in the order
* originally registered through the <code>add()</code> method.
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/DigesterRuleParser.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/DigesterRuleParser.java?rev=1125726&r1=1125725&r2=1125726&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/DigesterRuleParser.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/xmlrules/DigesterRuleParser.java Sat May 21 15:15:38 2011
@@ -507,15 +507,6 @@ public class DigesterRuleParser
}
/**
- * @deprecated Call match(namespaceURI,pattern) instead.
- */
- @Deprecated
- public List<Rule> match( String pattern )
- {
- return delegate.match( pattern );
- }
-
- /**
* This method passes through to the underlying Rules object.
*/
public List<Rule> match( String namespaceURI, String pattern )
Modified: commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java?rev=1125726&r1=1125725&r2=1125726&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java (original)
+++ commons/sandbox/digester3/trunk/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java Sat May 21 15:15:38 2011
@@ -101,7 +101,7 @@ public class RulesBaseTestCase
// perform tests
- assertEquals( "Initial rules list is empty", 0, digester.getRules().match( "a" ).size() );
+ assertEquals( "Initial rules list is empty", 0, digester.getRules().match( null, "a" ).size() );
digester.addSetProperties( "a" );
assertEquals( "Add a matching rule", 1, digester.getRules().match( null, "a" ).size() );
digester.addSetProperties( "b" );