Author: simonetripodi
Date: Tue May 10 12:52:49 2011
New Revision: 1101444
URL: http://svn.apache.org/viewvc?rev=1101444&view=rev
Log:
removed deprecated constructors
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java?rev=1101444&r1=1101443&r2=1101444&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/BeanPropertySetterRule.java
Tue May 10 12:52:49 2011
@@ -46,41 +46,6 @@ public class BeanPropertySetterRule exte
// ----------------------------------------------------------- Constructors
-
- /**
- * <p>Construct rule that sets the given property from the body text.</p>
- *
- * @param digester associated <code>Digester</code>
- * @param propertyName name of property to set
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #BeanPropertySetterRule(String propertyName)} instead.
- */
- @Deprecated
- public BeanPropertySetterRule(Digester digester, String propertyName) {
-
- this(propertyName);
-
- }
-
- /**
- * <p>Construct rule that automatically sets a property from the body text.
- *
- * <p> This construct creates a rule that sets the property
- * on the top object named the same as the current element.
- *
- * @param digester associated <code>Digester</code>
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #BeanPropertySetterRule()} instead.
- */
- @Deprecated
- public BeanPropertySetterRule(Digester digester) {
-
- this();
-
- }
-
/**
* <p>Construct rule that sets the given property from the body text.</p>
*
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java?rev=1101444&r1=1101443&r2=1101444&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallMethodRule.java
Tue May 10 12:52:49 2011
@@ -96,75 +96,6 @@ public class CallMethodRule extends Rule
// ----------------------------------------------------------- Constructors
- /**
- * Construct a "call method" rule with the specified method name. The
- * parameter types (if any) default to java.lang.String.
- *
- * @param digester The associated Digester
- * @param methodName Method name of the parent method to call
- * @param paramCount The number of parameters to collect, or
- * zero for a single argument from the body of this element.
- *
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #CallMethodRule(String methodName,int paramCount)} instead.
- */
- @Deprecated
- public CallMethodRule(Digester digester, String methodName,
- int paramCount) {
-
- this(methodName, paramCount);
-
- }
-
-
- /**
- * Construct a "call method" rule with the specified method name.
- *
- * @param digester The associated Digester
- * @param methodName Method name of the parent method to call
- * @param paramCount The number of parameters to collect, or
- * zero for a single argument from the body of ths element
- * @param paramTypes The Java class names of the arguments
- * (if you wish to use a primitive type, specify the corresonding
- * Java wrapper class instead, such as <code>java.lang.Boolean</code>
- * for a <code>boolean</code> parameter)
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #CallMethodRule(String methodName,int paramCount, String []
paramTypes)} instead.
- */
- @Deprecated
- public CallMethodRule(Digester digester, String methodName,
- int paramCount, String paramTypes[]) {
-
- this(methodName, paramCount, paramTypes);
-
- }
-
-
- /**
- * Construct a "call method" rule with the specified method name.
- *
- * @param digester The associated Digester
- * @param methodName Method name of the parent method to call
- * @param paramCount The number of parameters to collect, or
- * zero for a single argument from the body of ths element
- * @param paramTypes The Java classes that represent the
- * parameter types of the method arguments
- * (if you wish to use a primitive type, specify the corresonding
- * Java wrapper class instead, such as <code>java.lang.Boolean.TYPE</code>
- * for a <code>boolean</code> parameter)
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #CallMethodRule(String methodName,int paramCount, Class []
paramTypes)} instead.
- */
- @Deprecated
- public CallMethodRule(Digester digester, String methodName,
- int paramCount, Class<?> paramTypes[]) {
-
- this(methodName, paramCount, paramTypes);
- }
-
/**
* Construct a "call method" rule with the specified method name. The
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java?rev=1101444&r1=1101443&r2=1101444&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/CallParamRule.java
Tue May 10 12:52:49 2011
@@ -47,50 +47,6 @@ public class CallParamRule extends Rule
// ----------------------------------------------------------- Constructors
-
- /**
- * Construct a "call parameter" rule that will save the body text of this
- * element as the parameter value.
- *
- * <p>Note that if the element is empty the an <i>empty string</i> is
- * passed to the target method, not null. And if automatic type conversion
- * is being applied (ie if the target function takes something other than
- * a string as a parameter) then the conversion will fail if the converter
- * class does not accept an empty string as valid input.</p>
- *
- * @param digester The associated Digester
- * @param paramIndex The zero-relative parameter number
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #CallParamRule(int paramIndex)} instead.
- */
- @Deprecated
- public CallParamRule(Digester digester, int paramIndex) {
-
- this(paramIndex);
-
- }
-
-
- /**
- * Construct a "call parameter" rule that will save the value of the
- * specified attribute as the parameter value.
- *
- * @param digester The associated Digester
- * @param paramIndex The zero-relative parameter number
- * @param attributeName The name of the attribute to save
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #CallParamRule(int paramIndex, String attributeName)}
instead.
- */
- @Deprecated
- public CallParamRule(Digester digester, int paramIndex,
- String attributeName) {
-
- this(paramIndex, attributeName);
-
- }
-
/**
* Construct a "call parameter" rule that will save the body text of this
* element as the parameter value.
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java?rev=1101444&r1=1101443&r2=1101444&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/FactoryCreateRule.java
Tue May 10 12:52:49 2011
@@ -46,109 +46,6 @@ public class FactoryCreateRule extends R
// ----------------------------------------------------------- Constructors
-
- /**
- * Construct a factory create rule that will use the specified
- * class name to create an {@link ObjectCreationFactory} which will
- * then be used to create an object and push it on the stack.
- *
- * @param digester The associated Digester
- * @param className Java class name of the object creation factory class
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #FactoryCreateRule(String className)} instead.
- */
- @Deprecated
- public FactoryCreateRule(Digester digester, String className) {
-
- this(className);
-
- }
-
-
- /**
- * Construct a factory create rule that will use the specified
- * class to create an {@link ObjectCreationFactory} which will
- * then be used to create an object and push it on the stack.
- *
- * @param digester The associated Digester
- * @param clazz Java class name of the object creation factory class
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #FactoryCreateRule(Class clazz)} instead.
- */
- @Deprecated
- public FactoryCreateRule(Digester digester, Class<?> clazz) {
-
- this(clazz);
-
- }
-
-
- /**
- * Construct a factory create rule that will use the specified
- * class name (possibly overridden by the specified attribute if present)
- * to create an {@link ObjectCreationFactory}, which will then be used
- * to instantiate an object instance and push it onto the stack.
- *
- * @param digester The associated Digester
- * @param className Default Java class name of the factory class
- * @param attributeName Attribute name which, if present, contains an
- * override of the class name of the object creation factory to create.
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #FactoryCreateRule(String className, String attributeName)}
instead.
- */
- @Deprecated
- public FactoryCreateRule(Digester digester,
- String className, String attributeName) {
-
- this(className, attributeName);
-
- }
-
-
- /**
- * Construct a factory create rule that will use the specified
- * class (possibly overridden by the specified attribute if present)
- * to create an {@link ObjectCreationFactory}, which will then be used
- * to instantiate an object instance and push it onto the stack.
- *
- * @param digester The associated Digester
- * @param clazz Default Java class name of the factory class
- * @param attributeName Attribute name which, if present, contains an
- * override of the class name of the object creation factory to create.
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #FactoryCreateRule(Class clazz, String attributeName)}
instead.
- */
- @Deprecated
- public FactoryCreateRule(Digester digester,
- Class<?> clazz, String attributeName) {
-
- this(clazz, attributeName);
-
- }
-
-
- /**
- * Construct a factory create rule using the given, already instantiated,
- * {@link ObjectCreationFactory}.
- *
- * @param digester The associated Digester
- * @param creationFactory called on to create the object.
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #FactoryCreateRule(ObjectCreationFactory creationFactory)}
instead.
- */
- @Deprecated
- public FactoryCreateRule(Digester digester,
- ObjectCreationFactory creationFactory) {
-
- this(creationFactory);
-
- }
-
/**
* <p>Construct a factory create rule that will use the specified
* class name to create an {@link ObjectCreationFactory} which will
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java?rev=1101444&r1=1101443&r2=1101444&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectCreateRule.java
Tue May 10 12:52:49 2011
@@ -34,83 +34,6 @@ public class ObjectCreateRule extends Ru
// ----------------------------------------------------------- Constructors
-
- /**
- * Construct an object create rule with the specified class name.
- *
- * @param digester The associated Digester
- * @param className Java class name of the object to be created
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #ObjectCreateRule(String className)} instead.
- */
- @Deprecated
- public ObjectCreateRule(Digester digester, String className) {
-
- this(className);
-
- }
-
-
- /**
- * Construct an object create rule with the specified class.
- *
- * @param digester The associated Digester
- * @param clazz Java class name of the object to be created
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #ObjectCreateRule(Class clazz)} instead.
- */
- @Deprecated
- public ObjectCreateRule(Digester digester, Class<?> clazz) {
-
- this(clazz);
-
- }
-
-
- /**
- * Construct an object create rule with the specified class name and an
- * optional attribute name containing an override.
- *
- * @param digester The associated Digester
- * @param className Java class name of the object to be created
- * @param attributeName Attribute name which, if present, contains an
- * override of the class name to create
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #ObjectCreateRule(String className, String attributeName)}
instead.
- */
- @Deprecated
- public ObjectCreateRule(Digester digester, String className,
- String attributeName) {
-
- this (className, attributeName);
-
- }
-
-
- /**
- * Construct an object create rule with the specified class and an
- * optional attribute name containing an override.
- *
- * @param digester The associated Digester
- * @param attributeName Attribute name which, if present, contains an
- * @param clazz Java class name of the object to be created
- * override of the class name to create
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #ObjectCreateRule(String attributeName, Class clazz)}
instead.
- */
- @Deprecated
- public ObjectCreateRule(Digester digester,
- String attributeName,
- Class<?> clazz) {
-
- this(attributeName, clazz);
-
- }
-
/**
* Construct an object create rule with the specified class name.
*
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java?rev=1101444&r1=1101443&r2=1101444&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetNextRule.java
Tue May 10 12:52:49 2011
@@ -47,47 +47,6 @@ public class SetNextRule extends Rule {
// ----------------------------------------------------------- Constructors
-
- /**
- * Construct a "set next" rule with the specified method name. The
- * method's argument type is assumed to be the class of the
- * child object.
- *
- * @param digester The associated Digester
- * @param methodName Method name of the parent method to call
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #SetNextRule(String methodName)} instead.
- */
- @Deprecated
- public SetNextRule(Digester digester, String methodName) {
-
- this(methodName);
-
- }
-
-
- /**
- * Construct a "set next" rule with the specified method name.
- *
- * @param digester The associated Digester
- * @param methodName Method name of the parent method to call
- * @param paramType Java class of the parent method's argument
- * (if you wish to use a primitive type, specify the corresonding
- * Java wrapper class instead, such as <code>java.lang.Boolean</code>
- * for a <code>boolean</code> parameter)
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #SetNextRule(String methodName,String paramType)} instead.
- */
- @Deprecated
- public SetNextRule(Digester digester, String methodName,
- String paramType) {
-
- this(methodName, paramType);
-
- }
-
/**
* Construct a "set next" rule with the specified method name. The
* method's argument type is assumed to be the class of the
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java?rev=1101444&r1=1101443&r2=1101444&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertiesRule.java
Tue May 10 12:52:49 2011
@@ -43,23 +43,6 @@ public class SetPropertiesRule extends R
// ----------------------------------------------------------- Constructors
-
- /**
- * Default constructor sets only the the associated Digester.
- *
- * @param digester The digester with which this rule is associated
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #SetPropertiesRule()} instead.
- */
- @Deprecated
- public SetPropertiesRule(Digester digester) {
-
- this();
-
- }
-
-
/**
* Base constructor.
*/
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java?rev=1101444&r1=1101443&r2=1101444&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetPropertyRule.java
Tue May 10 12:52:49 2011
@@ -39,27 +39,6 @@ public class SetPropertyRule extends Rul
// ----------------------------------------------------------- Constructors
-
- /**
- * Construct a "set property" rule with the specified name and value
- * attributes.
- *
- * @param digester The digester with which this rule is associated
- * @param name Name of the attribute that will contain the name of the
- * property to be set
- * @param value Name of the attribute that will contain the value to which
- * the property should be set
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #SetPropertyRule(String name, String value)} instead.
- */
- @Deprecated
- public SetPropertyRule(Digester digester, String name, String value) {
-
- this(name, value);
-
- }
-
/**
* Construct a "set property" rule with the specified name and value
* attributes.
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java?rev=1101444&r1=1101443&r2=1101444&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetRootRule.java
Tue May 10 12:52:49 2011
@@ -39,47 +39,6 @@ public class SetRootRule extends Rule {
// ----------------------------------------------------------- Constructors
-
- /**
- * Construct a "set root" rule with the specified method name. The
- * method's argument type is assumed to be the class of the
- * child object.
- *
- * @param digester The associated Digester
- * @param methodName Method name of the parent method to call
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #SetRootRule(String methodName)} instead.
- */
- @Deprecated
- public SetRootRule(Digester digester, String methodName) {
-
- this(methodName);
-
- }
-
-
- /**
- * Construct a "set root" rule with the specified method name.
- *
- * @param digester The associated Digester
- * @param methodName Method name of the parent method to call
- * @param paramType Java class of the parent method's argument
- * (if you wish to use a primitive type, specify the corresonding
- * Java wrapper class instead, such as <code>java.lang.Boolean</code>
- * for a <code>boolean</code> parameter)
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #SetRootRule(String methodName,String paramType)} instead.
- */
- @Deprecated
- public SetRootRule(Digester digester, String methodName,
- String paramType) {
-
- this(methodName, paramType);
-
- }
-
/**
* Construct a "set root" rule with the specified method name. The
* method's argument type is assumed to be the class of the
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java?rev=1101444&r1=1101443&r2=1101444&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/SetTopRule.java
Tue May 10 12:52:49 2011
@@ -38,47 +38,6 @@ public class SetTopRule extends Rule {
// ----------------------------------------------------------- Constructors
-
- /**
- * Construct a "set parent" rule with the specified method name. The
- * "set parent" method's argument type is assumed to be the class of the
- * parent object.
- *
- * @param digester The associated Digester
- * @param methodName Method name of the "set parent" method to call
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #SetTopRule(String methodName)} instead.
- */
- @Deprecated
- public SetTopRule(Digester digester, String methodName) {
-
- this(methodName);
-
- }
-
-
- /**
- * Construct a "set parent" rule with the specified method name.
- *
- * @param digester The associated Digester
- * @param methodName Method name of the "set parent" method to call
- * @param paramType Java class of the "set parent" method's argument
- * (if you wish to use a primitive type, specify the corresonding
- * Java wrapper class instead, such as <code>java.lang.Boolean</code>
- * for a <code>boolean</code> parameter)
- *
- * @deprecated The digester instance is now set in the {@link
Digester#addRule} method.
- * Use {@link #SetTopRule(String methodName, String paramType)} instead.
- */
- @Deprecated
- public SetTopRule(Digester digester, String methodName,
- String paramType) {
-
- this(methodName, paramType);
-
- }
-
/**
* Construct a "set parent" rule with the specified method name. The
* "set parent" method's argument type is assumed to be the class of the
