Author: simonetripodi
Date: Sat Jan 29 22:45:11 2011
New Revision: 1065134
URL: http://svn.apache.org/viewvc?rev=1065134&view=rev
Log:
there's no need to prepend Linked* to rule builders, renamed stripping the
prefix off
Added:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/BeanPropertySetterBuilder.java
- copied, changed from r1065123,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedBeanPropertySetterBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/CallMethodBuilder.java
- copied, changed from r1064861,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedCallMethodBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/CallParamBuilder.java
- copied, changed from r1065125,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedCallParamBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/FactoryCreateBuilder.java
- copied, changed from r1065127,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedFactoryCreateBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/NestedPropertiesBuilder.java
- copied, changed from r1065041,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedNestedPropertiesBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ObjectCreateBuilder.java
- copied, changed from r1065131,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedObjectCreateBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ObjectParamBuilder.java
- copied, changed from r1065031,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedObjectParamBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ParamTypeBuilder.java
- copied, changed from r1065053,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedParamTypeBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/PathCallParamBuilder.java
- copied, changed from r1065126,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedPathCallParamBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/SetPropertiesBuilder.java
- copied, changed from r1065047,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedSetPropertiesBuilder.java
Removed:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedBeanPropertySetterBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedCallMethodBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedCallParamBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedFactoryCreateBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedNestedPropertiesBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedObjectCreateBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedObjectParamBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedParamTypeBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedPathCallParamBuilder.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedSetPropertiesBuilder.java
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedRuleBuilder.java
Copied:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/BeanPropertySetterBuilder.java
(from r1065123,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedBeanPropertySetterBuilder.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/BeanPropertySetterBuilder.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/BeanPropertySetterBuilder.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedBeanPropertySetterBuilder.java&r1=1065123&r2=1065134&rev=1065134&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedBeanPropertySetterBuilder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/BeanPropertySetterBuilder.java
Sat Jan 29 22:45:11 2011
@@ -20,7 +20,7 @@ package org.apache.commons.digester3.rul
/**
* Builder chained when invoking {@link LinkedRuleBuilder#setBeanProperty()}.
*/
-public interface LinkedBeanPropertySetterBuilder extends
BackToLinkedRuleBuilder {
+public interface BeanPropertySetterBuilder extends BackToLinkedRuleBuilder {
/**
* Sets the name of property to set.
@@ -28,6 +28,6 @@ public interface LinkedBeanPropertySette
* @param propertyName The name of property to set
* @return this builder instance
*/
- LinkedBeanPropertySetterBuilder withName(String propertyName);
+ BeanPropertySetterBuilder withName(String propertyName);
}
Copied:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/CallMethodBuilder.java
(from r1064861,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedCallMethodBuilder.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/CallMethodBuilder.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/CallMethodBuilder.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedCallMethodBuilder.java&r1=1064861&r2=1065134&rev=1065134&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedCallMethodBuilder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/CallMethodBuilder.java
Sat Jan 29 22:45:11 2011
@@ -20,7 +20,7 @@ package org.apache.commons.digester3.rul
/**
* Builder chained when invoking {@link LinkedRuleBuilder#callMethod(String)}.
*/
-public interface LinkedCallMethodBuilder extends BackToLinkedRuleBuilder {
+public interface CallMethodBuilder extends BackToLinkedRuleBuilder {
/**
* Sets the location of the target object.
@@ -31,7 +31,7 @@ public interface LinkedCallMethodBuilder
* @param targetOffset location of the target object.
* @return this builder instance
*/
- LinkedCallMethodBuilder withTargetOffset(int targetOffset);
+ CallMethodBuilder withTargetOffset(int targetOffset);
/**
* Sets the Java classes that represent the parameter types of the method
arguments.
@@ -42,6 +42,6 @@ public interface LinkedCallMethodBuilder
* @param paramTypes The Java classes that represent the parameter types
of the method arguments
* @return this builder instance
*/
- LinkedCallMethodBuilder withParamTypes(Class<?>...paramTypes);
+ CallMethodBuilder withParamTypes(Class<?>...paramTypes);
}
Copied:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/CallParamBuilder.java
(from r1065125,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedCallParamBuilder.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/CallParamBuilder.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/CallParamBuilder.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedCallParamBuilder.java&r1=1065125&r2=1065134&rev=1065134&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedCallParamBuilder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/CallParamBuilder.java
Sat Jan 29 22:45:11 2011
@@ -20,7 +20,7 @@ package org.apache.commons.digester3.rul
/**
* Builder chained when invoking {@link LinkedRuleBuilder#callParam(int)}.
*/
-public interface LinkedCallParamBuilder extends BackToLinkedRuleBuilder {
+public interface CallParamBuilder extends BackToLinkedRuleBuilder {
/**
* Sets the zero-relative parameter number.
@@ -28,7 +28,7 @@ public interface LinkedCallParamBuilder
* @param paramIndex The zero-relative parameter number
* @return this builder instance
*/
- LinkedCallParamBuilder ofIndex(int paramIndex);
+ CallParamBuilder ofIndex(int paramIndex);
/**
* Sets the attribute from which to save the parameter value.
@@ -36,7 +36,7 @@ public interface LinkedCallParamBuilder
* @param attributeName The attribute from which to save the parameter
value
* @return this builder instance
*/
- LinkedCallParamBuilder fromAttribute(String attributeName);
+ CallParamBuilder fromAttribute(String attributeName);
/**
* Flags the parameter to be set from the stack.
@@ -44,7 +44,7 @@ public interface LinkedCallParamBuilder
* @param fromStack the parameter flag to be set from the stack
* @return this builder instance
*/
- LinkedCallParamBuilder fromStack(boolean fromStack);
+ CallParamBuilder fromStack(boolean fromStack);
/**
* Sets the position of the object from the top of the stack.
@@ -52,6 +52,6 @@ public interface LinkedCallParamBuilder
* @param stackIndex The position of the object from the top of the stack
* @return this builder instance
*/
- LinkedCallParamBuilder withStackIndex(int stackIndex);
+ CallParamBuilder withStackIndex(int stackIndex);
}
Copied:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/FactoryCreateBuilder.java
(from r1065127,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedFactoryCreateBuilder.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/FactoryCreateBuilder.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/FactoryCreateBuilder.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedFactoryCreateBuilder.java&r1=1065127&r2=1065134&rev=1065134&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedFactoryCreateBuilder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/FactoryCreateBuilder.java
Sat Jan 29 22:45:11 2011
@@ -22,7 +22,7 @@ import org.apache.commons.digester3.spi.
/**
* Builder chained when invoking {@link
LinkedRuleBuilder#factoryCreate(String)}.
*/
-public interface LinkedFactoryCreateBuilder extends BackToLinkedRuleBuilder {
+public interface FactoryCreateBuilder extends BackToLinkedRuleBuilder {
/**
* Construct a factory create rule that will use the specified class name
to create an {@link ObjectCreationFactory}
@@ -31,7 +31,7 @@ public interface LinkedFactoryCreateBuil
* @param className Java class name of the object creation factory class
* @return this builder instance
*/
- LinkedFactoryCreateBuilder ofType(String className);
+ FactoryCreateBuilder ofType(String className);
/**
* Construct a factory create rule that will use the specified class to
create an {@link ObjectCreationFactory}
@@ -40,7 +40,7 @@ public interface LinkedFactoryCreateBuil
* @param type Java class of the object creation factory class
* @return this builder instance
*/
- LinkedFactoryCreateBuilder ofType(Class<?> type);
+ FactoryCreateBuilder ofType(Class<?> type);
/**
* Construct a factory create rule using the given, already instantiated,
{@link ObjectCreationFactory}.
@@ -49,7 +49,7 @@ public interface LinkedFactoryCreateBuil
* @param creationFactory called on to create the object
* @return this builder instance
*/
- <T> LinkedFactoryCreateBuilder usingFactory(ObjectCreationFactory<T>
creationFactory);
+ <T> FactoryCreateBuilder usingFactory(ObjectCreationFactory<T>
creationFactory);
/**
* Allows specify the attribute containing an override class name if it is
present.
@@ -57,7 +57,7 @@ public interface LinkedFactoryCreateBuil
* @param attributeName The attribute containing an override class name if
it is present
* @return this builder instance
*/
- LinkedFactoryCreateBuilder overriddenByAttribute(String attributeName);
+ FactoryCreateBuilder overriddenByAttribute(String attributeName);
/**
* Exceptions thrown by the object creation factory will be ignored or not.
@@ -65,6 +65,6 @@ public interface LinkedFactoryCreateBuil
* @param ignoreCreateExceptions if true, exceptions thrown by the object
creation factory will be ignored
* @return this builder instance
*/
- LinkedFactoryCreateBuilder ignoreCreateExceptions(boolean
ignoreCreateExceptions);
+ FactoryCreateBuilder ignoreCreateExceptions(boolean
ignoreCreateExceptions);
}
Modified:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedRuleBuilder.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedRuleBuilder.java?rev=1065134&r1=1065133&r2=1065134&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedRuleBuilder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedRuleBuilder.java
Sat Jan 29 22:45:11 2011
@@ -36,7 +36,7 @@ public interface LinkedRuleBuilder {
* Construct rule that automatically sets a property from the body text,
taking the property
* name the same as the current element.
*/
- LinkedBeanPropertySetterBuilder setBeanProperty();
+ BeanPropertySetterBuilder setBeanProperty();
/**
* Calls a method on an object on the stack (normally the top/parent
object), passing arguments collected from
@@ -44,29 +44,29 @@ public interface LinkedRuleBuilder {
*
* @param methodName Method name of the parent object to call
*/
- LinkedCallMethodBuilder callMethod(String methodName);
+ CallMethodBuilder callMethod(String methodName);
/**
* Saves a parameter for use by a surrounding {@link #callMethod(String)}.
*/
- LinkedCallParamBuilder callParam();
+ CallParamBuilder callParam();
/**
* Construct a "call parameter" rule that will save the body text of this
element as the parameter value.
*/
- LinkedPathCallParamBuilder callParamPath();
+ PathCallParamBuilder callParamPath();
/**
* Uses an {@link ObjectCreationFactory} to create a new object which it
pushes onto the object stack.
*
* When the element is complete, the object will be popped.
*/
- LinkedFactoryCreateBuilder factoryCreate();
+ FactoryCreateBuilder factoryCreate();
/**
* Construct an object.
*/
- LinkedObjectCreateBuilder createObject();
+ ObjectCreateBuilder createObject();
/**
* Saves a parameter for use by a surrounding {@link #callMethod(String)}.
@@ -74,13 +74,13 @@ public interface LinkedRuleBuilder {
* @param <T> The parameter type to pass along
* @param paramObj The parameter to pass along
*/
- <T> LinkedObjectParamBuilder objectParam(T paramObj);
+ <T> ObjectParamBuilder objectParam(T paramObj);
/**
* Sets properties on the object at the top of the stack,
* based on child elements with names matching properties on that object.
*/
- LinkedNestedPropertiesBuilder setNestedProperties();
+ NestedPropertiesBuilder setNestedProperties();
/**
* Calls a method on the (top-1) (parent) object, passing the top object
(child) as an argument,
@@ -88,12 +88,12 @@ public interface LinkedRuleBuilder {
*
* @param methodName Method name of the parent method to call
*/
- LinkedParamTypeBuilder setNext(String methodName);
+ ParamTypeBuilder setNext(String methodName);
/**
* Sets properties on the object at the top of the stack, based on
attributes with corresponding names.
*/
- LinkedSetPropertiesBuilder setProperties();
+ SetPropertiesBuilder setProperties();
/**
* Sets an individual property on the object at the top of the stack,
based on attributes with specified names.
@@ -108,13 +108,13 @@ public interface LinkedRuleBuilder {
*
* @param methodName Method name of the parent method to call
*/
- LinkedParamTypeBuilder setRoot(String methodName);
+ ParamTypeBuilder setRoot(String methodName);
/**
* Calls a "set parent" method on the top (child) object, passing the
(top-1) (parent) object as an argument.
*
* @param methodName Method name of the "set parent" method to call
*/
- LinkedParamTypeBuilder setTop(String methodName);
+ ParamTypeBuilder setTop(String methodName);
}
Copied:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/NestedPropertiesBuilder.java
(from r1065041,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedNestedPropertiesBuilder.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/NestedPropertiesBuilder.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/NestedPropertiesBuilder.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedNestedPropertiesBuilder.java&r1=1065041&r2=1065134&rev=1065134&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedNestedPropertiesBuilder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/NestedPropertiesBuilder.java
Sat Jan 29 22:45:11 2011
@@ -20,7 +20,7 @@ package org.apache.commons.digester3.rul
/**
* Builder chained when invoking {@link
LinkedRuleBuilder#setNestedProperties()}.
*/
-public interface LinkedNestedPropertiesBuilder extends BackToLinkedRuleBuilder
{
+public interface NestedPropertiesBuilder extends BackToLinkedRuleBuilder {
/**
* Allows element2property mapping to be overridden.
@@ -29,7 +29,7 @@ public interface LinkedNestedPropertiesB
* @param propertyName The java bean property to be assigned the value
* @return this builder instance
*/
- LinkedNestedPropertiesBuilder addAlias(String elementName, String
propertyName);
+ NestedPropertiesBuilder addAlias(String elementName, String propertyName);
/**
* When set to true, any text within child elements will have leading
@@ -39,6 +39,6 @@ public interface LinkedNestedPropertiesB
* @param trimData
* @return this builder instance
*/
- LinkedNestedPropertiesBuilder trimData(boolean trimData);
+ NestedPropertiesBuilder trimData(boolean trimData);
}
Copied:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ObjectCreateBuilder.java
(from r1065131,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedObjectCreateBuilder.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ObjectCreateBuilder.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ObjectCreateBuilder.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedObjectCreateBuilder.java&r1=1065131&r2=1065134&rev=1065134&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedObjectCreateBuilder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ObjectCreateBuilder.java
Sat Jan 29 22:45:11 2011
@@ -20,7 +20,7 @@ package org.apache.commons.digester3.rul
/**
* Builder chained when invoking {@link
LinkedRuleBuilder#objectCreate(String)}.
*/
-public interface LinkedObjectCreateBuilder extends BackToLinkedRuleBuilder {
+public interface ObjectCreateBuilder extends BackToLinkedRuleBuilder {
/**
* Construct an object with the specified class name.
@@ -28,7 +28,7 @@ public interface LinkedObjectCreateBuild
* @param className Java class name of the object to be created
* @return this builder instance
*/
- LinkedObjectCreateBuilder ofType(String className);
+ ObjectCreateBuilder ofType(String className);
/**
* Construct an object with the specified class.
@@ -36,7 +36,7 @@ public interface LinkedObjectCreateBuild
* @param type Java class of the object to be created
* @return this builder instance
*/
- LinkedObjectCreateBuilder ofType(Class<?> type);
+ ObjectCreateBuilder ofType(Class<?> type);
/**
* Allows specify the attribute containing an override class name if it is
present.
@@ -44,6 +44,6 @@ public interface LinkedObjectCreateBuild
* @param attributeName The attribute containing an override class name if
it is present
* @return this builder instance
*/
- LinkedObjectCreateBuilder overriddenByAttribute(String attributeName);
+ ObjectCreateBuilder overriddenByAttribute(String attributeName);
}
Copied:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ObjectParamBuilder.java
(from r1065031,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedObjectParamBuilder.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ObjectParamBuilder.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ObjectParamBuilder.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedObjectParamBuilder.java&r1=1065031&r2=1065134&rev=1065134&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedObjectParamBuilder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ObjectParamBuilder.java
Sat Jan 29 22:45:11 2011
@@ -20,7 +20,7 @@ package org.apache.commons.digester3.rul
/**
* Builder chained when invoking {@link
LinkedRuleBuilder#objectCreate(String)}.
*/
-public interface LinkedObjectParamBuilder extends BackToLinkedRuleBuilder {
+public interface ObjectParamBuilder extends BackToLinkedRuleBuilder {
/**
* The zero-relative index of the parameter we are saving.
@@ -28,7 +28,7 @@ public interface LinkedObjectParamBuilde
* @param paramIndex The zero-relative index of the parameter we are saving
* @return this builder instance
*/
- LinkedObjectParamBuilder ofIndex(int paramIndex);
+ ObjectParamBuilder ofIndex(int paramIndex);
/**
* The attribute which we are attempting to match.
@@ -36,6 +36,6 @@ public interface LinkedObjectParamBuilde
* @param attributeName The attribute which we are attempting to match
* @return this builder instance
*/
- LinkedObjectParamBuilder matchingAttribute(String attributeName);
+ ObjectParamBuilder matchingAttribute(String attributeName);
}
Copied:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ParamTypeBuilder.java
(from r1065053,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedParamTypeBuilder.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ParamTypeBuilder.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ParamTypeBuilder.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedParamTypeBuilder.java&r1=1065053&r2=1065134&rev=1065134&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedParamTypeBuilder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/ParamTypeBuilder.java
Sat Jan 29 22:45:11 2011
@@ -21,7 +21,7 @@ package org.apache.commons.digester3.rul
* Builder chained when invoking {@link LinkedRuleBuilder#setNext(String)},
* {@link LinkedRuleBuilder#setRoot(String)} or {@link
LinkedRuleBuilder#setTop(String)}.
*/
-public interface LinkedParamTypeBuilder extends BackToLinkedRuleBuilder {
+public interface ParamTypeBuilder extends BackToLinkedRuleBuilder {
/**
* Sets the Java class of the method's argument.
@@ -33,7 +33,7 @@ public interface LinkedParamTypeBuilder
* @param paramType The Java class of the method's argument
* @return this builder instance
*/
- LinkedParamTypeBuilder withParameterType(Class<?> paramType);
+ ParamTypeBuilder withParameterType(Class<?> paramType);
/**
* Sets the Java class name of the method's argument.
@@ -45,7 +45,7 @@ public interface LinkedParamTypeBuilder
* @param paramType The Java class name of the method's argument
* @return this builder instance
*/
- LinkedParamTypeBuilder withParameterType(String paramType);
+ ParamTypeBuilder withParameterType(String paramType);
/**
* Sets exact matching being used.
@@ -53,6 +53,6 @@ public interface LinkedParamTypeBuilder
* @param useExactMatch The exact matching being used
* @return this builder instance
*/
- LinkedParamTypeBuilder useExactMatch(boolean useExactMatch);
+ ParamTypeBuilder useExactMatch(boolean useExactMatch);
}
Copied:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/PathCallParamBuilder.java
(from r1065126,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedPathCallParamBuilder.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/PathCallParamBuilder.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/PathCallParamBuilder.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedPathCallParamBuilder.java&r1=1065126&r2=1065134&rev=1065134&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedPathCallParamBuilder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/PathCallParamBuilder.java
Sat Jan 29 22:45:11 2011
@@ -20,7 +20,7 @@ package org.apache.commons.digester3.rul
/**
* Builder chained when invoking {@link LinkedRuleBuilder#callParam(int)}.
*/
-public interface LinkedPathCallParamBuilder extends BackToLinkedRuleBuilder {
+public interface PathCallParamBuilder extends BackToLinkedRuleBuilder {
/**
* Sets the zero-relative parameter number.
@@ -28,6 +28,6 @@ public interface LinkedPathCallParamBuil
* @param paramIndex The zero-relative parameter number
* @return this builder instance
*/
- LinkedPathCallParamBuilder ofIndex(int paramIndex);
+ PathCallParamBuilder ofIndex(int paramIndex);
}
Copied:
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/SetPropertiesBuilder.java
(from r1065047,
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedSetPropertiesBuilder.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/SetPropertiesBuilder.java?p2=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/SetPropertiesBuilder.java&p1=commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedSetPropertiesBuilder.java&r1=1065047&r2=1065134&rev=1065134&view=diff
==============================================================================
---
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/LinkedSetPropertiesBuilder.java
(original)
+++
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/rulesbinder/SetPropertiesBuilder.java
Sat Jan 29 22:45:11 2011
@@ -20,7 +20,7 @@ package org.apache.commons.digester3.rul
/**
* Builder chained when invoking {@link
LinkedRuleBuilder#setNestedProperties()}.
*/
-public interface LinkedSetPropertiesBuilder extends BackToLinkedRuleBuilder {
+public interface SetPropertiesBuilder extends BackToLinkedRuleBuilder {
/**
* Add an additional attribute name to property name mapping.
@@ -29,7 +29,7 @@ public interface LinkedSetPropertiesBuil
* @param propertyName The java bean property to be assigned the value
* @return this builder instance
*/
- LinkedSetPropertiesBuilder addAlias(String attributeName, String
propertyName);
+ SetPropertiesBuilder addAlias(String attributeName, String propertyName);
/**
* Sets whether attributes found in the XML without matching properties
should be ignored.
@@ -41,6 +41,6 @@ public interface LinkedSetPropertiesBuil
* @param ignoreMissingProperty false to stop the parsing on unmatched
attributes
* @return this builder instance
*/
- LinkedSetPropertiesBuilder ignoreMissingProperty(boolean
ignoreMissingProperty);
+ SetPropertiesBuilder ignoreMissingProperty(boolean ignoreMissingProperty);
}
