Author: markt
Date: Sun Nov 30 14:32:18 2008
New Revision: 721914
URL: http://svn.apache.org/viewvc?rev=721914&view=rev
Log:
Generics changes for o.a.el
Modified:
tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java
tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java
tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java
tomcat/trunk/java/org/apache/el/parser/AstChoice.java
tomcat/trunk/java/org/apache/el/parser/AstCompositeExpression.java
tomcat/trunk/java/org/apache/el/parser/AstDeferredExpression.java
tomcat/trunk/java/org/apache/el/parser/AstDynamicExpression.java
tomcat/trunk/java/org/apache/el/parser/AstEmpty.java
tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java
tomcat/trunk/java/org/apache/el/parser/AstFunction.java
tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
tomcat/trunk/java/org/apache/el/parser/AstInteger.java
tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
tomcat/trunk/java/org/apache/el/parser/AstNegative.java
tomcat/trunk/java/org/apache/el/parser/AstNot.java
tomcat/trunk/java/org/apache/el/parser/AstNull.java
tomcat/trunk/java/org/apache/el/parser/AstString.java
tomcat/trunk/java/org/apache/el/parser/AstValue.java
tomcat/trunk/java/org/apache/el/parser/BooleanNode.java
tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
Modified: tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java Sun Nov 30
14:32:18 2008
@@ -42,7 +42,7 @@
super();
}
- public Object coerceToType(Object obj, Class type) {
+ public Object coerceToType(Object obj, Class<?> type) {
return ELSupport.coerceToType(obj, type);
}
@@ -59,7 +59,7 @@
}
public ValueExpression createValueExpression(ELContext context,
- String expression, Class expectedType) {
+ String expression, Class<?> expectedType) {
if (expectedType == null) {
throw new NullPointerException(MessageFactory
.get("error.value.expectedType"));
@@ -69,7 +69,7 @@
}
public ValueExpression createValueExpression(Object instance,
- Class expectedType) {
+ Class<?> expectedType) {
if (expectedType == null) {
throw new NullPointerException(MessageFactory
.get("error.value.expectedType"));
Modified: tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java Sun Nov 30
14:32:18 2008
@@ -80,7 +80,7 @@
public final class MethodExpressionImpl extends MethodExpression implements
Externalizable {
- private Class expectedType;
+ private Class<?> expectedType;
private String expr;
@@ -90,7 +90,7 @@
private transient Node node;
- private Class[] paramTypes;
+ private Class<?>[] paramTypes;
/**
*
@@ -108,7 +108,7 @@
*/
public MethodExpressionImpl(String expr, Node node,
FunctionMapper fnMapper, VariableMapper varMapper,
- Class expectedType, Class[] paramTypes) {
+ Class<?> expectedType, Class<?>[] paramTypes) {
super();
this.expr = expr;
this.node = node;
Modified: tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java Sun Nov 30
14:32:18 2008
@@ -33,17 +33,18 @@
public class MethodExpressionLiteral extends MethodExpression implements
Externalizable {
- private Class expectedType;
+ private Class<?> expectedType;
private String expr;
- private Class[] paramTypes;
+ private Class<?>[] paramTypes;
public MethodExpressionLiteral() {
// do nothing
}
- public MethodExpressionLiteral(String expr, Class expectedType, Class[]
paramTypes) {
+ public MethodExpressionLiteral(String expr, Class<?> expectedType,
+ Class<?>[] paramTypes) {
this.expr = expr;
this.expectedType = expectedType;
this.paramTypes = paramTypes;
Modified: tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java Sun Nov 30
14:32:18 2008
@@ -92,7 +92,7 @@
public final class ValueExpressionImpl extends ValueExpression implements
Externalizable {
- private Class expectedType;
+ private Class<?> expectedType;
private String expr;
@@ -110,7 +110,7 @@
*
*/
public ValueExpressionImpl(String expr, Node node, FunctionMapper fnMapper,
- VariableMapper varMapper, Class expectedType) {
+ VariableMapper varMapper, Class<?> expectedType) {
this.expr = expr;
this.node = node;
this.fnMapper = fnMapper;
@@ -133,7 +133,7 @@
*
* @see javax.el.ValueExpression#getExpectedType()
*/
- public Class getExpectedType() {
+ public Class<?> getExpectedType() {
return this.expectedType;
}
@@ -167,7 +167,7 @@
*
* @see javax.el.ValueExpression#getType(javax.el.ELContext)
*/
- public Class getType(ELContext context) throws PropertyNotFoundException,
+ public Class<?> getType(ELContext context) throws
PropertyNotFoundException,
ELException {
EvaluationContext ctx = new EvaluationContext(context, this.fnMapper,
this.varMapper);
Modified: tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java (original)
+++ tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java Sun Nov 30
14:32:18 2008
@@ -39,13 +39,13 @@
private Object value;
- private Class expectedType;
+ private Class<?> expectedType;
public ValueExpressionLiteral() {
super();
}
- public ValueExpressionLiteral(Object value, Class expectedType) {
+ public ValueExpressionLiteral(Object value, Class<?> expectedType) {
this.value = value;
this.expectedType = expectedType;
}
@@ -66,11 +66,11 @@
return true;
}
- public Class getType(ELContext context) {
+ public Class<?> getType(ELContext context) {
return (this.value != null) ? this.value.getClass() : null;
}
- public Class getExpectedType() {
+ public Class<?> getExpectedType() {
return this.expectedType;
}
Modified: tomcat/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELSupport.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELSupport.java Sun Nov 30 14:32:18 2008
@@ -184,7 +184,7 @@
if (ELArithmetic.isNumber(obj)) {
return new Character((char) ((Number) obj).shortValue());
}
- Class objType = obj.getClass();
+ Class<?> objType = obj.getClass();
if (obj instanceof Character) {
return (Character) obj;
}
@@ -209,7 +209,7 @@
}
protected final static Number coerceToNumber(final Number number,
- final Class type) throws IllegalArgumentException {
+ final Class<?> type) throws IllegalArgumentException {
if (Long.TYPE == type || Long.class.equals(type)) {
return new Long(number.longValue());
}
@@ -251,8 +251,8 @@
number, number.getClass(), type));
}
- public final static Number coerceToNumber(final Object obj, final Class
type)
- throws IllegalArgumentException {
+ public final static Number coerceToNumber(final Object obj,
+ final Class<?> type) throws IllegalArgumentException {
if (obj == null || "".equals(obj)) {
return coerceToNumber(ZERO, type);
}
@@ -273,7 +273,7 @@
}
protected final static Number coerceToNumber(final String val,
- final Class type) throws IllegalArgumentException {
+ final Class<?> type) throws IllegalArgumentException {
if (Long.TYPE == type || Long.class.equals(type)) {
return Long.valueOf(val);
}
@@ -319,7 +319,7 @@
}
}
- public final static void checkType(final Object obj, final Class type)
+ public final static void checkType(final Object obj, final Class<?> type)
throws IllegalArgumentException {
if (String.class.equals(type)) {
coerceToString(obj);
@@ -338,8 +338,8 @@
}
}
- public final static Object coerceToType(final Object obj, final Class type)
- throws IllegalArgumentException {
+ public final static Object coerceToType(final Object obj,
+ final Class<?> type) throws IllegalArgumentException {
if (type == null || Object.class.equals(type) ||
(obj != null && type.isAssignableFrom(obj.getClass()))) {
return obj;
Modified: tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ExpressionBuilder.java Sun Nov 30
14:32:18 2008
@@ -99,7 +99,7 @@
if (numChildren == 1) {
n = n.jjtGetChild(0);
} else {
- Class type = null;
+ Class<?> type = null;
Node child = null;
for (int i = 0; i < numChildren; i++) {
child = n.jjtGetChild(i);
@@ -189,15 +189,15 @@
}
}
- public ValueExpression createValueExpression(Class expectedType)
+ public ValueExpression createValueExpression(Class<?> expectedType)
throws ELException {
Node n = this.build();
return new ValueExpressionImpl(this.expression, n, this.fnMapper,
this.varMapper, expectedType);
}
- public MethodExpression createMethodExpression(Class expectedReturnType,
- Class[] expectedParamTypes) throws ELException {
+ public MethodExpression createMethodExpression(Class<?> expectedReturnType,
+ Class<?>[] expectedParamTypes) throws ELException {
Node n = this.build();
if (n instanceof AstValue || n instanceof AstIdentifier) {
return new MethodExpressionImpl(expression, n, this.fnMapper,
Modified: tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Sun Nov 30
14:32:18 2008
@@ -153,8 +153,8 @@
public Method getMethod() {
if (this.m == null) {
try {
- Class t = ReflectionUtil.forName(this.owner);
- Class[] p = ReflectionUtil.toTypeArray(this.types);
+ Class<?> t = ReflectionUtil.forName(this.owner);
+ Class<?>[] p = ReflectionUtil.toTypeArray(this.types);
this.m = t.getMethod(this.name, p);
} catch (Exception e) {
e.printStackTrace();
Modified: tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java Sun Nov 30
14:32:18 2008
@@ -35,7 +35,7 @@
super(i);
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
return Number.class;
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstChoice.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstChoice.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstChoice.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstChoice.java Sun Nov 30 14:32:18
2008
@@ -32,7 +32,7 @@
super(id);
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
Object val = this.getValue(ctx);
return (val != null) ? val.getClass() : null;
Modified: tomcat/trunk/java/org/apache/el/parser/AstCompositeExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstCompositeExpression.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstCompositeExpression.java
(original)
+++ tomcat/trunk/java/org/apache/el/parser/AstCompositeExpression.java Sun Nov
30 14:32:18 2008
@@ -33,7 +33,7 @@
super(id);
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
return String.class;
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstDeferredExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstDeferredExpression.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstDeferredExpression.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstDeferredExpression.java Sun Nov
30 14:32:18 2008
@@ -32,7 +32,7 @@
super(id);
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
return this.children[0].getType(ctx);
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstDynamicExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstDynamicExpression.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstDynamicExpression.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstDynamicExpression.java Sun Nov 30
14:32:18 2008
@@ -32,7 +32,7 @@
super(id);
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
return this.children[0].getType(ctx);
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstEmpty.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstEmpty.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstEmpty.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstEmpty.java Sun Nov 30 14:32:18
2008
@@ -35,7 +35,7 @@
super(id);
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
return Boolean.class;
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java Sun Nov 30
14:32:18 2008
@@ -52,7 +52,7 @@
return this.getFloatingPoint();
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
return this.getFloatingPoint().getClass();
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstFunction.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstFunction.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstFunction.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstFunction.java Sun Nov 30 14:32:18
2008
@@ -58,7 +58,7 @@
return prefix;
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
FunctionMapper fnMapper = ctx.getFunctionMapper();
@@ -90,7 +90,7 @@
this.getOutputName()));
}
- Class[] paramTypes = m.getParameterTypes();
+ Class<?>[] paramTypes = m.getParameterTypes();
Object[] params = null;
Object result = null;
int numParams = this.jjtGetNumChildren();
Modified: tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java Sun Nov 30
14:32:18 2008
@@ -37,7 +37,7 @@
super(id);
}
- public Class getType(EvaluationContext ctx) throws ELException {
+ public Class<?> getType(EvaluationContext ctx) throws ELException {
VariableMapper varMapper = ctx.getVariableMapper();
if (varMapper != null) {
ValueExpression expr = varMapper.resolveVariable(this.image);
@@ -87,23 +87,6 @@
ctx.getELResolver().setValue(ctx, null, this.image, value);
}
- private final Object invokeTarget(EvaluationContext ctx, Object target,
- Object[] paramValues) throws ELException {
- if (target instanceof MethodExpression) {
- MethodExpression me = (MethodExpression) target;
- return me.invoke(ctx.getELContext(), paramValues);
- } else if (target == null) {
- throw new MethodNotFoundException("Identity '" + this.image
- + "' was null and was unable to invoke");
- } else {
- throw new ELException(
- "Identity '"
- + this.image
- + "' does not reference a MethodExpression
instance, returned type: "
- + target.getClass().getName());
- }
- }
-
public Object invoke(EvaluationContext ctx, Class[] paramTypes,
Object[] paramValues) throws ELException {
return this.getMethodExpression(ctx).invoke(ctx.getELContext(),
paramValues);
Modified: tomcat/trunk/java/org/apache/el/parser/AstInteger.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstInteger.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstInteger.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstInteger.java Sun Nov 30 14:32:18
2008
@@ -47,7 +47,7 @@
return number;
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
return this.getInteger().getClass();
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java Sun Nov 30
14:32:18 2008
@@ -32,7 +32,7 @@
super(id);
}
- public Class getType(EvaluationContext ctx) throws ELException {
+ public Class<?> getType(EvaluationContext ctx) throws ELException {
return String.class;
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstNegative.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstNegative.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstNegative.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstNegative.java Sun Nov 30 14:32:18
2008
@@ -35,7 +35,7 @@
super(id);
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
return Number.class;
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstNot.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstNot.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstNot.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstNot.java Sun Nov 30 14:32:18 2008
@@ -32,7 +32,7 @@
super(id);
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
return Boolean.class;
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstNull.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstNull.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstNull.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstNull.java Sun Nov 30 14:32:18 2008
@@ -32,7 +32,7 @@
super(id);
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
return null;
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstString.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstString.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstString.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstString.java Sun Nov 30 14:32:18
2008
@@ -41,7 +41,7 @@
return this.string;
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
return String.class;
}
Modified: tomcat/trunk/java/org/apache/el/parser/AstValue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstValue.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Sun Nov 30 14:32:18
2008
@@ -52,7 +52,7 @@
super(id);
}
- public Class getType(EvaluationContext ctx) throws ELException {
+ public Class<?> getType(EvaluationContext ctx) throws ELException {
Target t = getTarget(ctx);
ctx.setPropertyResolved(false);
return ctx.getELResolver().getType(ctx, t.base, t.property);
@@ -169,7 +169,7 @@
Method m = ReflectionUtil.getMethod(t.base, t.property, paramTypes);
Object result = null;
try {
- result = m.invoke(t.base, (Object[]) paramValues);
+ result = m.invoke(t.base, paramValues);
} catch (IllegalAccessException iae) {
throw new ELException(iae);
} catch (InvocationTargetException ite) {
Modified: tomcat/trunk/java/org/apache/el/parser/BooleanNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/BooleanNode.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/BooleanNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/BooleanNode.java Sun Nov 30 14:32:18
2008
@@ -32,7 +32,7 @@
public BooleanNode(int i) {
super(i);
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
return Boolean.class;
}
Modified: tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/SimpleNode.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/SimpleNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/SimpleNode.java Sun Nov 30 14:32:18
2008
@@ -121,7 +121,7 @@
this.image = image;
}
- public Class getType(EvaluationContext ctx)
+ public Class<?> getType(EvaluationContext ctx)
throws ELException {
throw new UnsupportedOperationException();
}
@@ -150,11 +150,13 @@
}
}
- public Object invoke(EvaluationContext ctx, Class[] paramTypes, Object[]
paramValues) throws ELException {
+ public Object invoke(EvaluationContext ctx, Class[] paramTypes,
+ Object[] paramValues) throws ELException {
throw new UnsupportedOperationException();
}
- public MethodInfo getMethodInfo(EvaluationContext ctx, Class[] paramTypes)
throws ELException {
+ public MethodInfo getMethodInfo(EvaluationContext ctx,
+ Class[] paramTypes) throws ELException {
throw new UnsupportedOperationException();
}
}
Modified: tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java?rev=721914&r1=721913&r2=721914&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java (original)
+++ tomcat/trunk/java/org/apache/el/util/ReflectionUtil.java Sun Nov 30
14:32:18 2008
@@ -43,7 +43,7 @@
protected static final String[] PRIMITIVE_NAMES = new String[] { "boolean",
"byte", "char", "double", "float", "int", "long", "short", "void"
};
- protected static final Class[] PRIMITIVES = new Class[] { boolean.class,
+ protected static final Class<?>[] PRIMITIVES = new Class[] { boolean.class,
byte.class, char.class, double.class, float.class, int.class,
long.class, short.class, Void.TYPE };
@@ -54,11 +54,11 @@
super();
}
- public static Class forName(String name) throws ClassNotFoundException {
+ public static Class<?> forName(String name) throws ClassNotFoundException {
if (null == name || "".equals(name)) {
return null;
}
- Class c = forNamePrimitive(name);
+ Class<?> c = forNamePrimitive(name);
if (c == null) {
if (name.endsWith("[]")) {
String nc = name.substring(0, name.length() - 2);
@@ -71,7 +71,7 @@
return c;
}
- protected static Class forNamePrimitive(String name) {
+ protected static Class<?> forNamePrimitive(String name) {
if (name.length() <= 8) {
int p = Arrays.binarySearch(PRIMITIVE_NAMES, name);
if (p >= 0) {
@@ -87,10 +87,10 @@
* @return
* @throws ClassNotFoundException
*/
- public static Class[] toTypeArray(String[] s) throws
ClassNotFoundException {
+ public static Class<?>[] toTypeArray(String[] s) throws
ClassNotFoundException {
if (s == null)
return null;
- Class[] c = new Class[s.length];
+ Class<?>[] c = new Class[s.length];
for (int i = 0; i < s.length; i++) {
c[i] = forName(s[i]);
}
@@ -102,7 +102,7 @@
* @param c
* @return
*/
- public static String[] toTypeNameArray(Class[] c) {
+ public static String[] toTypeNameArray(Class<?>[] c) {
if (c == null)
return null;
String[] s = new String[c.length];
@@ -121,7 +121,7 @@
* @throws MethodNotFoundException
*/
public static Method getMethod(Object base, Object property,
- Class[] paramTypes) throws MethodNotFoundException {
+ Class<?>[] paramTypes) throws MethodNotFoundException {
if (base == null || property == null) {
throw new MethodNotFoundException(MessageFactory.get(
"error.method.notfound", base, property,
@@ -142,7 +142,7 @@
return method;
}
- protected static final String paramString(Class[] types) {
+ protected static final String paramString(Class<?>[] types) {
if (types != null) {
StringBuffer sb = new StringBuffer();
for (int i = 0; i < types.length; i++) {
@@ -166,7 +166,6 @@
public static PropertyDescriptor getPropertyDescriptor(Object base,
Object property) throws ELException, PropertyNotFoundException {
String name = ELSupport.coerceToString(property);
- PropertyDescriptor p = null;
try {
PropertyDescriptor[] desc = Introspector.getBeanInfo(
base.getClass()).getPropertyDescriptors();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
