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/11 22:34:19 UTC
svn commit: r1102079 - in
/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3:
CallMethodRule.java CallParamRule.java Digester.java ObjectParamRule.java
PathCallParamRule.java
Author: simonetripodi
Date: Wed May 11 20:34:19 2011
New Revision: 1102079
URL: http://svn.apache.org/viewvc?rev=1102079&view=rev
Log:
Digester parameters stack APIs now use Generics
Modified:
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/Digester.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
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=1102079&r1=1102078&r2=1102079&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 Wed May 11 20:34:19 2011
@@ -437,7 +437,7 @@ public class CallMethodRule extends Rule
Object parameters[] = null;
if (paramCount > 0) {
- parameters = (Object[]) getDigester().popParams();
+ parameters = getDigester().popParams();
if (getDigester().getLogger().isTraceEnabled()) {
for (int i=0,size=parameters.length;i<size;i++) {
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=1102079&r1=1102078&r2=1102079&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 Wed May 11 20:34:19 2011
@@ -179,7 +179,7 @@ public class CallParamRule extends Rule
// if this CallParamRule is reused in subsequent nesting.
if(param != null) {
- Object parameters[] = (Object[]) getDigester().peekParams();
+ Object parameters[] = getDigester().peekParams();
parameters[paramIndex] = param;
}
}
@@ -212,7 +212,7 @@ public class CallParamRule extends Rule
public void end(String namespace, String name) {
if (bodyTextStack != null && !bodyTextStack.empty()) {
// what we do now is push one parameter onto the top set of parameters
- Object parameters[] = (Object[]) getDigester().peekParams();
+ Object parameters[] = getDigester().peekParams();
parameters[paramIndex] = bodyTextStack.pop();
}
}
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java?rev=1102079&r1=1102078&r2=1102079&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/Digester.java Wed May 11 20:34:19 2011
@@ -246,7 +246,7 @@ public class Digester extends DefaultHan
*
* @since 2.0
*/
- private final Stack<Object> params = new Stack<Object>();
+ private final Stack<Object[]> params = new Stack<Object[]>();
/**
@@ -3035,7 +3035,7 @@ public class Digester extends DefaultHan
* <p>The parameters stack is used to store <code>CallMethodRule</code> parameters.
* See {@link #params}.</p>
*/
- public Object peekParams() {
+ public Object[] peekParams() {
try {
return (params.peek());
@@ -3058,7 +3058,7 @@ public class Digester extends DefaultHan
* @param n Index of the desired element, where 0 is the top of the stack,
* 1 is the next element down, and so on.
*/
- public Object peekParams(int n) {
+ public Object[] peekParams(int n) {
int index = (params.size() - 1) - n;
if (index < 0) {
@@ -3082,7 +3082,7 @@ public class Digester extends DefaultHan
* <p>The parameters stack is used to store <code>CallMethodRule</code> parameters.
* See {@link #params}.</p>
*/
- public Object popParams() {
+ public Object[] popParams() {
try {
if (log.isTraceEnabled()) {
@@ -3105,7 +3105,7 @@ public class Digester extends DefaultHan
*
* @param object The new object
*/
- public void pushParams(Object object) {
+ public void pushParams(Object...object) {
if (log.isTraceEnabled()) {
log.trace("Pushing params");
}
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java?rev=1102079&r1=1102078&r2=1102079&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/ObjectParamRule.java Wed May 11 20:34:19 2011
@@ -97,7 +97,7 @@ public class ObjectParamRule extends Rul
public void begin(String namespace, String name,
Attributes attributes) throws Exception {
Object anAttribute = null;
- Object parameters[] = (Object[]) getDigester().peekParams();
+ Object parameters[] = getDigester().peekParams();
if (attributeName != null) {
anAttribute = attributes.getValue(attributeName);
Modified: commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java
URL: http://svn.apache.org/viewvc/commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java?rev=1102079&r1=1102078&r2=1102079&view=diff
==============================================================================
--- commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java (original)
+++ commons/sandbox/digester3/trunk/src/main/java/org/apache/commons/digester3/PathCallParamRule.java Wed May 11 20:34:19 2011
@@ -74,7 +74,7 @@ public class PathCallParamRule extends R
String param = getDigester().getMatch();
if(param != null) {
- Object parameters[] = (Object[]) getDigester().peekParams();
+ Object parameters[] = getDigester().peekParams();
parameters[paramIndex] = param;
}