Author: markt
Date: Thu Nov 5 01:13:12 2009
New Revision: 832950
URL: http://svn.apache.org/viewvc?rev=832950&view=rev
Log:
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48132
Patch provided by sebb with some additional issues reported by Eclispe
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/ELArithmetic.java
tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java
tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java
tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java
tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java
tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java
tomcat/trunk/java/org/apache/el/parser/AstAnd.java
tomcat/trunk/java/org/apache/el/parser/AstBracketSuffix.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/AstDiv.java
tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.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/AstEqual.java
tomcat/trunk/java/org/apache/el/parser/AstFalse.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/AstGreaterThan.java
tomcat/trunk/java/org/apache/el/parser/AstGreaterThanEqual.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/AstLessThan.java
tomcat/trunk/java/org/apache/el/parser/AstLessThanEqual.java
tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java
tomcat/trunk/java/org/apache/el/parser/AstMinus.java
tomcat/trunk/java/org/apache/el/parser/AstMod.java
tomcat/trunk/java/org/apache/el/parser/AstMult.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/AstNotEqual.java
tomcat/trunk/java/org/apache/el/parser/AstNull.java
tomcat/trunk/java/org/apache/el/parser/AstOr.java
tomcat/trunk/java/org/apache/el/parser/AstPlus.java
tomcat/trunk/java/org/apache/el/parser/AstString.java
tomcat/trunk/java/org/apache/el/parser/AstTrue.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/ParseException.java
tomcat/trunk/java/org/apache/el/parser/SimpleNode.java
tomcat/trunk/java/org/apache/el/parser/Token.java
tomcat/trunk/java/org/apache/el/parser/TokenMgrError.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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/ExpressionFactoryImpl.java Thu Nov 5
01:13:12 2009
@@ -42,10 +42,12 @@
super();
}
+ @Override
public Object coerceToType(Object obj, Class<?> type) {
return ELSupport.coerceToType(obj, type);
}
+ @Override
public MethodExpression createMethodExpression(ELContext context,
String expression, Class<?> expectedReturnType,
Class<?>[] expectedParamTypes) {
@@ -58,6 +60,7 @@
expectedParamTypes);
}
+ @Override
public ValueExpression createValueExpression(ELContext context,
String expression, Class<?> expectedType) {
if (expectedType == null) {
@@ -68,6 +71,7 @@
return builder.createValueExpression(expectedType);
}
+ @Override
public ValueExpression createValueExpression(Object instance,
Class<?> expectedType) {
if (expectedType == null) {
Modified: tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionImpl.java Thu Nov 5
01:13:12 2009
@@ -145,6 +145,7 @@
* @see java.util.Hashtable
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
return (obj instanceof MethodExpressionImpl && obj.hashCode() == this
.hashCode());
@@ -171,6 +172,7 @@
*
* @see javax.el.Expression#getExpressionString()
*/
+ @Override
public String getExpressionString() {
return this.expr;
}
@@ -197,6 +199,7 @@
* the cause property of this exception, if available.
* @see javax.el.MethodExpression#getMethodInfo(javax.el.ELContext)
*/
+ @Override
public MethodInfo getMethodInfo(ELContext context)
throws PropertyNotFoundException, MethodNotFoundException,
ELException {
@@ -234,6 +237,7 @@
* @see java.util.Hashtable
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
return this.expr.hashCode();
}
@@ -268,6 +272,7 @@
* @see javax.el.MethodExpression#invoke(javax.el.ELContext,
* java.lang.Object[])
*/
+ @Override
public Object invoke(ELContext context, Object[] params)
throws PropertyNotFoundException, MethodNotFoundException,
ELException {
@@ -308,6 +313,7 @@
out.writeObject(this.varMapper);
}
+ @Override
public boolean isLiteralText() {
return false;
}
Modified: tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java (original)
+++ tomcat/trunk/java/org/apache/el/MethodExpressionLiteral.java Thu Nov 5
01:13:12 2009
@@ -50,10 +50,12 @@
this.paramTypes = paramTypes;
}
+ @Override
public MethodInfo getMethodInfo(ELContext context) throws ELException {
return new MethodInfo(this.expr, this.expectedType, this.paramTypes);
}
+ @Override
public Object invoke(ELContext context, Object[] params) throws
ELException {
if (this.expectedType != null) {
return ELSupport.coerceToType(this.expr, this.expectedType);
@@ -62,18 +64,22 @@
}
}
+ @Override
public String getExpressionString() {
return this.expr;
}
+ @Override
public boolean equals(Object obj) {
return (obj instanceof MethodExpressionLiteral && this.hashCode() ==
obj.hashCode());
}
+ @Override
public int hashCode() {
return this.expr.hashCode();
}
+ @Override
public boolean isLiteralText() {
return true;
}
Modified: tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/ValueExpressionImpl.java Thu Nov 5
01:13:12 2009
@@ -123,6 +123,7 @@
*
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
return (obj instanceof ValueExpressionImpl && obj.hashCode() == this
.hashCode());
@@ -133,6 +134,7 @@
*
* @see javax.el.ValueExpression#getExpectedType()
*/
+ @Override
public Class<?> getExpectedType() {
return this.expectedType;
}
@@ -147,6 +149,7 @@
*
* @see javax.el.Expression#getExpressionString()
*/
+ @Override
public String getExpressionString() {
return this.expr;
}
@@ -167,6 +170,7 @@
*
* @see javax.el.ValueExpression#getType(javax.el.ELContext)
*/
+ @Override
public Class<?> getType(ELContext context) throws
PropertyNotFoundException,
ELException {
EvaluationContext ctx = new EvaluationContext(context, this.fnMapper,
@@ -179,6 +183,7 @@
*
* @see javax.el.ValueExpression#getValue(javax.el.ELContext)
*/
+ @Override
public Object getValue(ELContext context) throws PropertyNotFoundException,
ELException {
EvaluationContext ctx = new EvaluationContext(context, this.fnMapper,
@@ -195,6 +200,7 @@
*
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
return this.expr.hashCode();
}
@@ -204,6 +210,7 @@
*
* @see javax.el.ValueExpression#isLiteralText()
*/
+ @Override
public boolean isLiteralText() {
try {
return this.getNode() instanceof AstLiteralExpression;
@@ -217,6 +224,7 @@
*
* @see javax.el.ValueExpression#isReadOnly(javax.el.ELContext)
*/
+ @Override
public boolean isReadOnly(ELContext context)
throws PropertyNotFoundException, ELException {
EvaluationContext ctx = new EvaluationContext(context, this.fnMapper,
@@ -241,6 +249,7 @@
* @see javax.el.ValueExpression#setValue(javax.el.ELContext,
* java.lang.Object)
*/
+ @Override
public void setValue(ELContext context, Object value)
throws PropertyNotFoundException, PropertyNotWritableException,
ELException {
@@ -257,6 +266,7 @@
out.writeObject(this.varMapper);
}
+ @Override
public String toString() {
return "ValueExpression["+this.expr+"]";
}
Modified: tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java (original)
+++ tomcat/trunk/java/org/apache/el/ValueExpressionLiteral.java Thu Nov 5
01:13:12 2009
@@ -50,6 +50,7 @@
this.expectedType = expectedType;
}
+ @Override
public Object getValue(ELContext context) {
if (this.expectedType != null) {
return ELSupport.coerceToType(this.value, this.expectedType);
@@ -57,27 +58,33 @@
return this.value;
}
+ @Override
public void setValue(ELContext context, Object value) {
throw new PropertyNotWritableException(MessageFactory.get(
"error.value.literal.write", this.value));
}
+ @Override
public boolean isReadOnly(ELContext context) {
return true;
}
+ @Override
public Class<?> getType(ELContext context) {
return (this.value != null) ? this.value.getClass() : null;
}
+ @Override
public Class<?> getExpectedType() {
return this.expectedType;
}
+ @Override
public String getExpressionString() {
return (this.value != null) ? this.value.toString() : null;
}
+ @Override
public boolean equals(Object obj) {
return (obj instanceof ValueExpressionLiteral && this
.equals((ValueExpressionLiteral) obj));
@@ -88,10 +95,12 @@
.equals(ve.value))));
}
+ @Override
public int hashCode() {
return (this.value != null) ? this.value.hashCode() : 0;
}
+ @Override
public boolean isLiteralText() {
return true;
}
Modified: tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java Thu Nov 5 01:13:12
2009
@@ -32,10 +32,12 @@
public final static class BigDecimalDelegate extends ELArithmetic {
+ @Override
protected Number add(Number num0, Number num1) {
return ((BigDecimal) num0).add((BigDecimal) num1);
}
+ @Override
protected Number coerce(Number num) {
if (num instanceof BigDecimal)
return num;
@@ -44,27 +46,33 @@
return new BigDecimal(num.doubleValue());
}
+ @Override
protected Number coerce(String str) {
return new BigDecimal(str);
}
+ @Override
protected Number divide(Number num0, Number num1) {
return ((BigDecimal) num0).divide((BigDecimal) num1,
BigDecimal.ROUND_HALF_UP);
}
+ @Override
protected Number subtract(Number num0, Number num1) {
return ((BigDecimal) num0).subtract((BigDecimal) num1);
}
+ @Override
protected Number mod(Number num0, Number num1) {
return new Double(num0.doubleValue() % num1.doubleValue());
}
+ @Override
protected Number multiply(Number num0, Number num1) {
return ((BigDecimal) num0).multiply((BigDecimal) num1);
}
+ @Override
public boolean matches(Object obj0, Object obj1) {
return (obj0 instanceof BigDecimal || obj1 instanceof BigDecimal);
}
@@ -72,36 +80,44 @@
public final static class BigIntegerDelegate extends ELArithmetic {
+ @Override
protected Number add(Number num0, Number num1) {
return ((BigInteger) num0).add((BigInteger) num1);
}
+ @Override
protected Number coerce(Number num) {
if (num instanceof BigInteger)
return num;
return new BigInteger(num.toString());
}
+ @Override
protected Number coerce(String str) {
return new BigInteger(str);
}
+ @Override
protected Number divide(Number num0, Number num1) {
return (new BigDecimal((BigInteger) num0)).divide(new
BigDecimal((BigInteger) num1), BigDecimal.ROUND_HALF_UP);
}
+ @Override
protected Number multiply(Number num0, Number num1) {
return ((BigInteger) num0).multiply((BigInteger) num1);
}
+ @Override
protected Number mod(Number num0, Number num1) {
return ((BigInteger) num0).mod((BigInteger) num1);
}
+ @Override
protected Number subtract(Number num0, Number num1) {
return ((BigInteger) num0).subtract((BigInteger) num1);
}
+ @Override
public boolean matches(Object obj0, Object obj1) {
return (obj0 instanceof BigInteger || obj1 instanceof BigInteger);
}
@@ -109,6 +125,7 @@
public final static class DoubleDelegate extends ELArithmetic {
+ @Override
protected Number add(Number num0, Number num1) {
// could only be one of these
if (num0 instanceof BigDecimal) {
@@ -119,6 +136,7 @@
return new Double(num0.doubleValue() + num1.doubleValue());
}
+ @Override
protected Number coerce(Number num) {
if (num instanceof Double)
return num;
@@ -127,18 +145,22 @@
return new Double(num.doubleValue());
}
+ @Override
protected Number coerce(String str) {
return new Double(str);
}
+ @Override
protected Number divide(Number num0, Number num1) {
return new Double(num0.doubleValue() / num1.doubleValue());
}
+ @Override
protected Number mod(Number num0, Number num1) {
return new Double(num0.doubleValue() % num1.doubleValue());
}
+ @Override
protected Number subtract(Number num0, Number num1) {
// could only be one of these
if (num0 instanceof BigDecimal) {
@@ -149,6 +171,7 @@
return new Double(num0.doubleValue() - num1.doubleValue());
}
+ @Override
protected Number multiply(Number num0, Number num1) {
// could only be one of these
if (num0 instanceof BigDecimal) {
@@ -159,6 +182,7 @@
return new Double(num0.doubleValue() * num1.doubleValue());
}
+ @Override
public boolean matches(Object obj0, Object obj1) {
return (obj0 instanceof Double
|| obj1 instanceof Double
@@ -172,36 +196,44 @@
public final static class LongDelegate extends ELArithmetic {
+ @Override
protected Number add(Number num0, Number num1) {
return new Long(num0.longValue() + num1.longValue());
}
+ @Override
protected Number coerce(Number num) {
if (num instanceof Long)
return num;
return new Long(num.longValue());
}
+ @Override
protected Number coerce(String str) {
return new Long(str);
}
+ @Override
protected Number divide(Number num0, Number num1) {
return new Long(num0.longValue() / num1.longValue());
}
+ @Override
protected Number mod(Number num0, Number num1) {
return new Long(num0.longValue() % num1.longValue());
}
+ @Override
protected Number subtract(Number num0, Number num1) {
return new Long(num0.longValue() - num1.longValue());
}
+ @Override
protected Number multiply(Number num0, Number num1) {
return new Long(num0.longValue() * num1.longValue());
}
+ @Override
public boolean matches(Object obj0, Object obj1) {
return (obj0 instanceof Long || obj1 instanceof Long);
}
Modified: tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/EvaluationContext.java Thu Nov 5
01:13:12 2009
@@ -43,38 +43,47 @@
return this.elContext;
}
+ @Override
public FunctionMapper getFunctionMapper() {
return this.fnMapper;
}
+ @Override
public VariableMapper getVariableMapper() {
return this.varMapper;
}
+ @Override
public Object getContext(Class key) {
return this.elContext.getContext(key);
}
+ @Override
public ELResolver getELResolver() {
return this.elContext.getELResolver();
}
+ @Override
public boolean isPropertyResolved() {
return this.elContext.isPropertyResolved();
}
+ @Override
public void putContext(Class key, Object contextObject) {
this.elContext.putContext(key, contextObject);
}
+ @Override
public void setPropertyResolved(boolean resolved) {
this.elContext.setPropertyResolved(resolved);
}
+ @Override
public Locale getLocale() {
return this.elContext.getLocale();
}
+ @Override
public void setLocale(Locale locale) {
this.elContext.setLocale(locale);
}
Modified: tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperFactory.java Thu Nov 5
01:13:12 2009
@@ -41,6 +41,7 @@
/* (non-Javadoc)
* @see javax.el.FunctionMapper#resolveFunction(java.lang.String,
java.lang.String)
*/
+ @Override
public Method resolveFunction(String prefix, String localName) {
if (this.memento == null) {
this.memento = new FunctionMapperImpl();
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/FunctionMapperImpl.java Thu Nov 5
01:13:12 2009
@@ -47,6 +47,7 @@
* @see javax.el.FunctionMapper#resolveFunction(java.lang.String,
* java.lang.String)
*/
+ @Override
public Method resolveFunction(String prefix, String localName) {
if (this.functions != null) {
Function f = this.functions.get(prefix + ":" + localName);
@@ -174,6 +175,7 @@
/* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj) {
if (obj instanceof Function) {
return this.hashCode() == obj.hashCode();
@@ -184,6 +186,7 @@
/* (non-Javadoc)
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
return (this.prefix + this.localName).hashCode();
}
Modified: tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/VariableMapperFactory.java Thu Nov 5
01:13:12 2009
@@ -36,6 +36,7 @@
return this.momento;
}
+ @Override
public ValueExpression resolveVariable(String variable) {
ValueExpression expr = this.target.resolveVariable(variable);
if (expr != null) {
@@ -47,6 +48,7 @@
return expr;
}
+ @Override
public ValueExpression setVariable(String variable, ValueExpression
expression) {
throw new UnsupportedOperationException("Cannot Set Variables on
Factory");
}
Modified: tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/VariableMapperImpl.java Thu Nov 5
01:13:12 2009
@@ -37,10 +37,12 @@
super();
}
+ @Override
public ValueExpression resolveVariable(String variable) {
return this.vars.get(variable);
}
+ @Override
public ValueExpression setVariable(String variable,
ValueExpression expression) {
return this.vars.put(variable, expression);
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ArithmeticNode.java Thu Nov 5
01:13:12 2009
@@ -35,6 +35,7 @@
super(i);
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
return Number.class;
Modified: tomcat/trunk/java/org/apache/el/parser/AstAnd.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstAnd.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstAnd.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstAnd.java Thu Nov 5 01:13:12 2009
@@ -32,6 +32,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj = children[0].getValue(ctx);
Modified: tomcat/trunk/java/org/apache/el/parser/AstBracketSuffix.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstBracketSuffix.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstBracketSuffix.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstBracketSuffix.java Thu Nov 5
01:13:12 2009
@@ -32,6 +32,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
return this.children[0].getValue(ctx);
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstChoice.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstChoice.java Thu Nov 5 01:13:12
2009
@@ -32,12 +32,14 @@
super(id);
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
Object val = this.getValue(ctx);
return (val != null) ? val.getClass() : null;
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstCompositeExpression.java
(original)
+++ tomcat/trunk/java/org/apache/el/parser/AstCompositeExpression.java Thu Nov
5 01:13:12 2009
@@ -33,11 +33,13 @@
super(id);
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
return String.class;
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
StringBuilder sb = new StringBuilder(16);
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstDeferredExpression.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstDeferredExpression.java Thu Nov
5 01:13:12 2009
@@ -32,21 +32,25 @@
super(id);
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
return this.children[0].getType(ctx);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
return this.children[0].getValue(ctx);
}
+ @Override
public boolean isReadOnly(EvaluationContext ctx)
throws ELException {
return this.children[0].isReadOnly(ctx);
}
+ @Override
public void setValue(EvaluationContext ctx, Object value)
throws ELException {
this.children[0].setValue(ctx, value);
Modified: tomcat/trunk/java/org/apache/el/parser/AstDiv.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstDiv.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstDiv.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstDiv.java Thu Nov 5 01:13:12 2009
@@ -33,6 +33,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
Modified: tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstDotSuffix.java Thu Nov 5
01:13:12 2009
@@ -32,6 +32,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
return this.image;
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstDynamicExpression.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstDynamicExpression.java Thu Nov 5
01:13:12 2009
@@ -32,21 +32,25 @@
super(id);
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
return this.children[0].getType(ctx);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
return this.children[0].getValue(ctx);
}
+ @Override
public boolean isReadOnly(EvaluationContext ctx)
throws ELException {
return this.children[0].isReadOnly(ctx);
}
+ @Override
public void setValue(EvaluationContext ctx, Object value)
throws ELException {
this.children[0].setValue(ctx, value);
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstEmpty.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstEmpty.java Thu Nov 5 01:13:12
2009
@@ -35,11 +35,13 @@
super(id);
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
return Boolean.class;
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj = this.children[0].getValue(ctx);
Modified: tomcat/trunk/java/org/apache/el/parser/AstEqual.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstEqual.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstEqual.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstEqual.java Thu Nov 5 01:13:12
2009
@@ -32,6 +32,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
Modified: tomcat/trunk/java/org/apache/el/parser/AstFalse.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstFalse.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstFalse.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstFalse.java Thu Nov 5 01:13:12
2009
@@ -32,6 +32,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
return Boolean.FALSE;
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstFloatingPoint.java Thu Nov 5
01:13:12 2009
@@ -47,11 +47,13 @@
return this.number;
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
return this.getFloatingPoint();
}
+ @Override
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstFunction.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstFunction.java Thu Nov 5 01:13:12
2009
@@ -58,6 +58,7 @@
return prefix;
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
@@ -75,6 +76,7 @@
return m.getReturnType();
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
@@ -127,6 +129,7 @@
}
+ @Override
public String toString()
{
return ELParserTreeConstants.jjtNodeName[id] + "[" +
this.getOutputName() + "]";
Modified: tomcat/trunk/java/org/apache/el/parser/AstGreaterThan.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstGreaterThan.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstGreaterThan.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstGreaterThan.java Thu Nov 5
01:13:12 2009
@@ -32,6 +32,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
Modified: tomcat/trunk/java/org/apache/el/parser/AstGreaterThanEqual.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstGreaterThanEqual.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstGreaterThanEqual.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstGreaterThanEqual.java Thu Nov 5
01:13:12 2009
@@ -32,6 +32,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstIdentifier.java Thu Nov 5
01:13:12 2009
@@ -37,6 +37,7 @@
super(id);
}
+ @Override
public Class<?> getType(EvaluationContext ctx) throws ELException {
VariableMapper varMapper = ctx.getVariableMapper();
if (varMapper != null) {
@@ -49,6 +50,7 @@
return ctx.getELResolver().getType(ctx, null, this.image);
}
+ @Override
public Object getValue(EvaluationContext ctx) throws ELException {
VariableMapper varMapper = ctx.getVariableMapper();
if (varMapper != null) {
@@ -61,6 +63,7 @@
return ctx.getELResolver().getValue(ctx, null, this.image);
}
+ @Override
public boolean isReadOnly(EvaluationContext ctx) throws ELException {
VariableMapper varMapper = ctx.getVariableMapper();
if (varMapper != null) {
@@ -73,6 +76,7 @@
return ctx.getELResolver().isReadOnly(ctx, null, this.image);
}
+ @Override
public void setValue(EvaluationContext ctx, Object value)
throws ELException {
VariableMapper varMapper = ctx.getVariableMapper();
@@ -87,12 +91,14 @@
ctx.getELResolver().setValue(ctx, null, this.image, value);
}
+ @Override
public Object invoke(EvaluationContext ctx, Class[] paramTypes,
Object[] paramValues) throws ELException {
return this.getMethodExpression(ctx).invoke(ctx.getELContext(),
paramValues);
}
+ @Override
public MethodInfo getMethodInfo(EvaluationContext ctx, Class[] paramTypes)
throws ELException {
return this.getMethodExpression(ctx).getMethodInfo(ctx.getELContext());
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstInteger.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstInteger.java Thu Nov 5 01:13:12
2009
@@ -47,11 +47,13 @@
return number;
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
return this.getInteger().getClass();
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
return this.getInteger();
Modified: tomcat/trunk/java/org/apache/el/parser/AstLessThan.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstLessThan.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstLessThan.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstLessThan.java Thu Nov 5 01:13:12
2009
@@ -32,6 +32,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
Modified: tomcat/trunk/java/org/apache/el/parser/AstLessThanEqual.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstLessThanEqual.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstLessThanEqual.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstLessThanEqual.java Thu Nov 5
01:13:12 2009
@@ -32,6 +32,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstLiteralExpression.java Thu Nov 5
01:13:12 2009
@@ -32,14 +32,17 @@
super(id);
}
+ @Override
public Class<?> getType(EvaluationContext ctx) throws ELException {
return String.class;
}
+ @Override
public Object getValue(EvaluationContext ctx) throws ELException {
return this.image;
}
+ @Override
public void setImage(String image) {
if (image.indexOf('\\') == -1) {
this.image = image;
Modified: tomcat/trunk/java/org/apache/el/parser/AstMinus.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstMinus.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstMinus.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstMinus.java Thu Nov 5 01:13:12
2009
@@ -33,6 +33,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
Modified: tomcat/trunk/java/org/apache/el/parser/AstMod.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstMod.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstMod.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstMod.java Thu Nov 5 01:13:12 2009
@@ -33,6 +33,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
Modified: tomcat/trunk/java/org/apache/el/parser/AstMult.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstMult.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstMult.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstMult.java Thu Nov 5 01:13:12 2009
@@ -33,6 +33,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstNegative.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstNegative.java Thu Nov 5 01:13:12
2009
@@ -35,11 +35,13 @@
super(id);
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
return Number.class;
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj = this.children[0].getValue(ctx);
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstNot.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstNot.java Thu Nov 5 01:13:12 2009
@@ -32,11 +32,13 @@
super(id);
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
return Boolean.class;
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj = this.children[0].getValue(ctx);
Modified: tomcat/trunk/java/org/apache/el/parser/AstNotEqual.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstNotEqual.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstNotEqual.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstNotEqual.java Thu Nov 5 01:13:12
2009
@@ -32,6 +32,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstNull.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstNull.java Thu Nov 5 01:13:12 2009
@@ -32,11 +32,13 @@
super(id);
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
return null;
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
return null;
Modified: tomcat/trunk/java/org/apache/el/parser/AstOr.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstOr.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstOr.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstOr.java Thu Nov 5 01:13:12 2009
@@ -32,6 +32,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj = this.children[0].getValue(ctx);
Modified: tomcat/trunk/java/org/apache/el/parser/AstPlus.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstPlus.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstPlus.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstPlus.java Thu Nov 5 01:13:12 2009
@@ -33,6 +33,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
Object obj0 = this.children[0].getValue(ctx);
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstString.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstString.java Thu Nov 5 01:13:12
2009
@@ -41,16 +41,19 @@
return this.string;
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
return String.class;
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
return this.getString();
}
+ @Override
public void setImage(String image) {
if (image.indexOf('\\') == -1) {
this.image = image;
Modified: tomcat/trunk/java/org/apache/el/parser/AstTrue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/AstTrue.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstTrue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstTrue.java Thu Nov 5 01:13:12 2009
@@ -32,6 +32,7 @@
super(id);
}
+ @Override
public Object getValue(EvaluationContext ctx)
throws ELException {
return Boolean.TRUE;
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/AstValue.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/AstValue.java Thu Nov 5 01:13:12
2009
@@ -52,6 +52,7 @@
super(id);
}
+ @Override
public Class<?> getType(EvaluationContext ctx) throws ELException {
Target t = getTarget(ctx);
ctx.setPropertyResolved(false);
@@ -103,6 +104,7 @@
return t;
}
+ @Override
public Object getValue(EvaluationContext ctx) throws ELException {
Object base = this.children[0].getValue(ctx);
int propCount = this.jjtGetNumChildren();
@@ -122,12 +124,14 @@
return base;
}
+ @Override
public boolean isReadOnly(EvaluationContext ctx) throws ELException {
Target t = getTarget(ctx);
ctx.setPropertyResolved(false);
return ctx.getELResolver().isReadOnly(ctx, t.base, t.property);
}
+ @Override
public void setValue(EvaluationContext ctx, Object value)
throws ELException {
Target t = getTarget(ctx);
@@ -155,6 +159,7 @@
}
+ @Override
public MethodInfo getMethodInfo(EvaluationContext ctx, Class[] paramTypes)
throws ELException {
Target t = getTarget(ctx);
@@ -163,6 +168,7 @@
.getParameterTypes());
}
+ @Override
public Object invoke(EvaluationContext ctx, Class[] paramTypes,
Object[] paramValues) throws ELException {
Target t = getTarget(ctx);
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/BooleanNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/BooleanNode.java Thu Nov 5 01:13:12
2009
@@ -32,6 +32,7 @@
public BooleanNode(int i) {
super(i);
}
+ @Override
public Class<?> getType(EvaluationContext ctx)
throws ELException {
return Boolean.class;
Modified: tomcat/trunk/java/org/apache/el/parser/ParseException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ParseException.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ParseException.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ParseException.java Thu Nov 5
01:13:12 2009
@@ -96,6 +96,7 @@
* of the final stack trace, and hence the correct error message
* gets displayed.
*/
+ @Override
public String getMessage() {
if (!specialConstructor) {
return super.getMessage();
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=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/SimpleNode.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/SimpleNode.java Thu Nov 5 01:13:12
2009
@@ -84,6 +84,7 @@
* otherwise overriding toString() is probably all you need to do.
*/
+ @Override
public String toString() {
if (this.image != null) {
return ELParserTreeConstants.jjtNodeName[id] + "[" + this.image
Modified: tomcat/trunk/java/org/apache/el/parser/Token.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/Token.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/Token.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/Token.java Thu Nov 5 01:13:12 2009
@@ -90,6 +90,7 @@
/**
* Returns the image.
*/
+ @Override
public String toString()
{
return image;
Modified: tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java?rev=832950&r1=832949&r2=832950&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/TokenMgrError.java Thu Nov 5
01:13:12 2009
@@ -114,6 +114,7 @@
*
* from this method for such cases in the release version of your parser.
*/
+ @Override
public String getMessage() {
return super.getMessage();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
